Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsTwoStaffingServiceImpl.java

@@ -196,11 +196,11 @@ public class TzsTwoStaffingServiceImpl extends BaseService<TzsTwoStaffingDto, Tz
                 tzsTwoStaffing.setCompletionRatio(decimalFormat.format(divide) + "%");
 
             }
-            if (ObjectUtils.isEmpty(tzsTwoStaffing.getResponsiblePersonsNumber()) || tzsTwoStaffing.getResponsiblePersonsNumber() == 0
+            if (ObjectUtils.isEmpty(tzsTwoStaffing.getResponsibleUnitsAllocateNumber()) || tzsTwoStaffing.getResponsibleUnitsAllocateNumber() == 0
                     || ObjectUtils.isEmpty(tzsTwoStaffing.getNumberOfUnits()) || tzsTwoStaffing.getNumberOfUnits() == 0) {
                 tzsTwoStaffing.setProportion("0%");
             } else {
-                BigDecimal bigDecimal = new BigDecimal(tzsTwoStaffing.getResponsiblePersonsNumber().toString());
+                BigDecimal bigDecimal = new BigDecimal(tzsTwoStaffing.getResponsibleUnitsAllocateNumber().toString());
                 BigDecimal bigDecimal1 = new BigDecimal(tzsTwoStaffing.getNumberOfUnits().toString());
                 BigDecimal divide = bigDecimal.divide(bigDecimal1, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
                 tzsTwoStaffing.setProportion(decimalFormat.format(divide) + "%");
@@ -236,27 +236,7 @@ public class TzsTwoStaffingServiceImpl extends BaseService<TzsTwoStaffingDto, Tz
 
         if(!ObjectUtils.isEmpty(companyList.getRecords())){
             for (TzsTwoStaffingCompanyDto item : companyList.getRecords()) {
-
-                if (item.getUnitType().contains("使用单位") && (item.getUnitType().contains("充装单位")
-                        || item.getUnitType().contains("安装改造维修单位")
-                        || item.getUnitType().contains("制造单位")
-                        || item.getUnitType().contains("设计单位"))) {
-                    item.setCompleteNormal(Integer.valueOf(item.getAllDone()) == 1 ? "是" : "否");
-                    continue;
-                }
-
-                if (item.getUnitType().contains("使用单位")) {
-                    item.setCompleteNormal(Integer.valueOf(item.getUseDone()) == 1 ? "是" : "否");
-                    continue;
-                }
-
-                if (item.getUnitType().contains("充装单位")
-                        || item.getUnitType().contains("安装改造维修单位")
-                        || item.getUnitType().contains("制造单位")
-                        || item.getUnitType().contains("设计单位")) {
-                    item.setCompleteNormal(Integer.valueOf(item.getProductDone()) == 1 ? "是" : "否");
-                    continue;
-                }
+                item.setCompleteNormal(Integer.valueOf(item.getCompleteNormal()) == 1 ? "是" : "否");
             }
         }
         return companyList;