#ZH
野心家
2025-05-26 c9b270dae703ee077a4e41013d7662c5e61afd29
#ZH
3个文件已修改
17 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/domain/param/RgvWrkMastParam.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/index.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/domain/param/RgvWrkMastParam.java
@@ -28,6 +28,8 @@
    private String modiTime;
    //更新时间
    private String appeTime;
    private String crnStrTime;
    private String crnEndTime;
    private String rgvSts;
    public RgvWrkMastParam(){};
@@ -42,5 +44,7 @@
        this.wrkSts$ = wrkMast.getWrkSts$();
        this.modiTime = wrkMast.getModiTime$();
        this.appeTime = wrkMast.getAppeTime$();
        this.crnStrTime = wrkMast.getCrnStrTime$();
        this.crnEndTime = wrkMast.getCrnEndTime$();
    }
}
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -344,7 +344,9 @@
                        wrkMast.setWrkSts(2L);
                        wrkMast.setRgvNo(rgvProtocol.getRgvNo());
                        wrkMast.setAppeTime(new Date());
                        Date now = new Date();
                        wrkMast.setAppeTime(now);
                        wrkMast.setCrnStrTime(now);
                        try {
                            wrkMastService.updateById(wrkMast);
                            break;
@@ -396,6 +398,7 @@
                    wrkMast.setWrkSts(3L);
                    Date now = new Date();
                    wrkMast.setAppeTime(now);
                    wrkMast.setCrnEndTime(now);
                    try{
                        try{
                            if (reportSwitch){
src/main/webapp/views/index.html
@@ -286,6 +286,14 @@
                            prop="modiTime"
                            label="下发时间">
                    </el-table-column>
                    <el-table-column
                            prop="crnStrTime"
                            label="开始执行时间">
                    </el-table-column>
                    <el-table-column
                            prop="crnEndTime"
                            label="执行结束时间">
                    </el-table-column>
<!--                    <el-table-column-->
<!--                            prop="modiTime"-->
<!--                            label="更新时间">-->