111

k94314517

2023-09-13 6252abae2d37cbf7ae4e2eb6411170f440657e12

 server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java

@@ -1755,12 +1755,18 @@
                wreev.setDeviceCode(re.getDeviceCode()+"|"+re.getDeviceName());
                wreev.setCreateTime(format.format(re.getCreateTime()));
                wreev.setQualifiedNum( (Objects.nonNull(re.getQualifiedNum()) ? re.getQualifiedNum() : 0)+unintname);
                wreev.setUnqualifiedNum((Objects.nonNull(re.getUnqualifiedNum()) ? re.getQualifiedNum() : 0)+unintname);
                wreev.setUnqualifiedNum((Objects.nonNull(re.getUnqualifiedNum()) ? re.getUnqualifiedNum() : 0)+unintname);
                Integer duration = re.getDuration();
                Integer h = duration/3600;
                Integer m = (duration%3600)/60;
                Integer s = ((duration%3600)%60);
                wreev.setDuration(h+"小时"+m+"分钟"+s+"秒");
                if (Objects.nonNull(duration)){
                    Integer h = duration/3600;
                    Integer m = (duration%3600)/60;
                    Integer s = ((duration%3600)%60);
                    wreev.setDuration(h+"小时"+m+"分钟"+s+"秒");
                }else {
                    wreev.setDuration("-");
                }
                wreev.setSalaryType(re.getSalaryType());
                wreev.setSalaryPrice(re.getSalaryYuan());
                list.add(wreev);

        }
@@ -1807,7 +1813,7 @@
            wreev.setProcedureName(re.getProcedureName());
            wreev.setUnintname(unintname);
            if(re.getOmodel().getPlanNum() != null){
                wreev.setPlanNum(re.getOmodel().getPlanNum()+unintname );
                wreev.setPlanNum(re.getOmodel().getPlanNum().toString() );
            }
            wreev.setMaterialDonetype(re.getMaterialDonetype());
            wreev.setDeviceCode(re.getDeviceCode()+"|"+re.getDeviceName());