两员配备-企业两员配备情况查询更新

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsTwoStaffingMapper.xml

@@ -10,15 +10,21 @@
         view_two_staffing
     where
         supervise_org_code like concat('%',#{orgCode},'%')
-    <if test="companyDto.unitType != '' and companyDto.unitType != null">
-        and unit_type like concat('%',#{companyDto.unitType},'%')
-    </if>
-    <if test="companyDto.useUnit != '' and companyDto.useUnit != null">
-        and unit_unit like concat('%',#{companyDto.useUnit},'%')
-    </if>
-    <if test="companyDto.useCode != '' and companyDto.useCode != null">
-        and use_code like concat('%',#{companyDto.useCode},'%')
-    </if>
+        <if test="companyDto.unitType != '' and companyDto.unitType != null">
+            and unit_type like concat('%',#{companyDto.unitType},'%')
+        </if>
+        <if test="companyDto.useUnit != '' and companyDto.useUnit != null">
+            and use_unit like concat('%',#{companyDto.useUnit},'%')
+        </if>
+        <if test="companyDto.useCode != '' and companyDto.useCode != null">
+            and use_code like concat('%',#{companyDto.useCode},'%')
+        </if>
+        <if test="companyDto.completeNormal != '' and companyDto.completeNormal == 1 ">
+            and (useDone = '1' or productDone = '1')
+        </if>
+        <if test="companyDto.completeNormal != '' and companyDto.completeNormal == 0 ">
+            and useDone = '0' and productDone = '0'
+        </if>
     </select>
     <select id="getListByOrgCode" resultType="com.yeejoin.amos.boot.module.tcm.api.entity.TzsTwoStaffing">
 

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

@@ -75,29 +75,31 @@ public class TzsTwoStaffingServiceImpl extends BaseService<TzsTwoStaffingDto, Tz
 
         Page<TzsTwoStaffingCompanyDto> companyList = tzsTwoStaffingMapper.getCompanyList(page, companyDto, orgCode);
 
-        companyList.getRecords().stream().map(item -> {
-            if (item.getUnitType().contains("使用单位")) {
-                item.setCompleteNormal(Integer.valueOf(item.getUseDone()) > 1 ? "是" : "否");
+        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;
+                }
             }
-
-            if (item.getUnitType().contains("充装单位")
-                    || item.getUnitType().contains("安装改造维修单位")
-                    || item.getUnitType().contains("制造单位")
-                    || item.getUnitType().contains("设计单位")) {
-                item.setCompleteNormal(Integer.valueOf(item.getProductDone()) > 1 ? "是" : "否");
-            }
-
-            if (item.getUnitType().contains("使用单位") && (item.getUnitType().contains("充装单位")
-                    || item.getUnitType().contains("安装改造维修单位")
-                    || item.getUnitType().contains("制造单位")
-                    || item.getUnitType().contains("设计单位"))) {
-                item.setCompleteNormal(Integer.valueOf(item.getAllDone()) > 1 ? "是" : "否");
-            }
-
-            return item;
-        });
-
-
+        }
         return companyList;
     }
 }
\ No newline at end of file