1检验申请筛选条件日期修改，日期不能按照！= ’‘判断

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionResultModel.java

@@ -75,8 +75,6 @@ public class JyjcInspectionResultModel extends BaseModel {
     @ApiModelProperty(value = "不符合项")
     private String nonConformance;
 
-//    @ApiModelProperty(value = "整改情况")
-//    private String rectification;
 
     @ApiModelProperty(value = "备注(无用预留)")
     private String remark;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -28,7 +28,10 @@
             and inspection_classify = #{inspectionClassify}
         </if>
         <if test="inspectionUnitName != null and inspectionUnitName != ''">
-            and inspection_unit_code in (select use_code from tz_base_enterprise_info where use_unit like concat('%',#{inspectionUnitName},'%'))
+            and inspection_unit_name like concat('%',#{inspectionUnitName},'%'))
+        </if>
+        <if test="applicationUnitName != null and applicationUnitName != ''">
+            and application_unit_name like concat('%',#{applicationUnitName},'%'))
         </if>
         <if test="inspectionUnitCode != null and inspectionUnitCode != ''">
             and inspection_unit_code = #{inspectionUnitCode} and status != '6610'
@@ -36,16 +39,13 @@
         <if test="applicationUnitCode != null and applicationUnitCode != ''">
             and application_unit_code = #{applicationUnitCode}
         </if>
-        <if test="applicationUnitName != null and applicationUnitName != ''">
-            and application_unit_code in (select use_code from tz_base_enterprise_info where use_unit like concat('%',#{inspectionUnitName},'%'))
-        </if>
         <if test="equipClassify != null and equipClassify != ''">
             and equip_classify = #{equipClassify}
         </if>
-        <if test="applicationDate != null and applicationDate != ''">
+        <if test="applicationDate != null">
             and application_date = #{applicationDate}
         </if>
-        <if test="acceptDate != null and acceptDate != ''">
+        <if test="acceptDate != null">
             and accept_date = #{acceptDate}
         </if>
         <if test="inspectionChargePerson != null and inspectionChargePerson != ''">
@@ -57,11 +57,6 @@
         <if test="bizType != null and bizType != ''">
             and biz_type = #{bizType}
         </if>
-<!--        <if test="roleIds.size()>0">-->
-<!--            <foreach collection="roleIds" item="item" separator="or">-->
-<!--                and workflow_role like concat('%',#{item},'%')-->
-<!--            </foreach>-->
-<!--        </if>-->
         </where>
         order by tzjia.application_no desc
     </select>
@@ -92,10 +87,10 @@
             <if test="jyjcInspectionApplicationModel.equipClassify != null and jyjcInspectionApplicationModel.equipClassify != ''">
                 and tzjia.equip_classify = #{jyjcInspectionApplicationModel.equipClassify}
             </if>
-            <if test="jyjcInspectionApplicationModel.applicationDate != null and jyjcInspectionApplicationModel.applicationDate != ''">
-                and tzjia.application_date = #{jyjcInspectionApplicationModel.applicationDate}
+            <if test="jyjcInspectionApplicationModel.applicationDate != null">
+                and date_eq(tzjia.application_date, #{jyjcInspectionApplicationModel.applicationDate})
             </if>
-            <if test="jyjcInspectionApplicationModel.acceptDate != null and jyjcInspectionApplicationModel.acceptDate != ''">
+            <if test="jyjcInspectionApplicationModel.acceptDate != null">
                 and tzjia.accept_date = #{jyjcInspectionApplicationModel.acceptDate}
             </if>
             <if test="jyjcInspectionApplicationModel.inspectionChargePerson != null and jyjcInspectionApplicationModel.inspectionChargePerson != ''">
@@ -112,10 +107,10 @@
             </if>
 
             <if test="jyjcInspectionApplicationModel.inspectionUnitName != null and jyjcInspectionApplicationModel.inspectionUnitName != ''">
-                and tzjia.inspection_unit_code = (select use_code from tz_base_enterprise_info where use_unit like concat('%',#{jyjcInspectionApplicationModel.inspectionUnitName},'%'))
+                and tzjia.inspection_unit_name like concat('%',#{jyjcInspectionApplicationModel.inspectionUnitName},'%'))
             </if>
             <if test="jyjcInspectionApplicationModel.applicationUnitName != null and jyjcInspectionApplicationModel.applicationUnitName != ''">
-                and tzjia.application_unit_code = (select use_code from tz_base_enterprise_info where use_unit like concat('%',#{jyjcInspectionApplicationModel.inspectionUnitName},'%'))
+                and tzjia.application_unit_name like concat('%',#{jyjcInspectionApplicationModel.applicationUnitName},'%'))
             </if>
             <if test="jyjcInspectionApplicationModel.inspectionUnitCode != null and jyjcInspectionApplicationModel.inspectionUnitCode != ''">
                 and tzjia.inspection_unit_code = #{jyjcInspectionApplicationModel.inspectionUnitCode} and tzjia.status != '6610'
@@ -123,7 +118,6 @@
             <if test="jyjcInspectionApplicationModel.applicationUnitCode != null and jyjcInspectionApplicationModel.applicationUnitCode != ''">
                 and tzjia.application_unit_code = #{jyjcInspectionApplicationModel.applicationUnitCode}
             </if>
-
             <choose>
                 <when test="identity == 'apply'">
                     and (tzjia.application_unit_code = #{currentApplicationUnitCode} OR tzjia.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionResultMapper.xml

@@ -53,7 +53,7 @@
                 and res.inspection_type = #{jyjcInspectionResultModel.inspectionType}
             </if>
             <if test="jyjcInspectionResultModel.applicationDate!=null">
-                AND TO_DAYS(res.application_date) = TO_DAYS(#{jyjcInspectionResultModel.applicationDate})
+                AND res.application_date = #{jyjcInspectionResultModel.applicationDate}
             </if>
         </where>
         ORDER BY application_date DESC
@@ -135,7 +135,7 @@
                 and res.inspection_type = #{jyjcInspectionResultModel.inspectionType}
             </if>
             <if test="jyjcInspectionResultModel.applicationDate!=null">
-                AND TO_DAYS(res.application_date) = TO_DAYS(#{jyjcInspectionResultModel.applicationDate})
+                AND res.application_date = #{jyjcInspectionResultModel.applicationDate}
             </if>
             <if test="jyjcInspectionResultModel.useUnitCreditCode != '' and jyjcInspectionResultModel.useUnitCreditCode != null">
                 and ibjui.use_unit_credit_code like concat('%',#{jyjcInspectionResultModel.useUnitCreditCode},'%')

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

@@ -403,7 +403,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             // 设置检验、检测资质信息
             setBaseUnitLicences(unitCode, jyjcOpeningApplicationModel, true);
             // 设置检验、检测人员信息
-            setJYJCUserList(unitCode, jyjcOpeningApplicationModel, true);
+            setJYJCUserList(unitCode, jyjcOpeningApplicationModel, true, jyjcOpeningApplicationModel.getOpenBizType());
         } else {
             jyjcOpeningApplicationModel = new JyjcOpeningApplicationModel();
             jyjcOpeningApplicationModel.setResultType("input");
@@ -482,7 +482,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         return "";
     }
 
-    private void setJYJCUserList(String unitCode, JyjcOpeningApplicationModel jyjcOpeningApplicationModel, boolean isNeedFilter) {
+    private void setJYJCUserList(String unitCode, JyjcOpeningApplicationModel jyjcOpeningApplicationModel, boolean isNeedFilter, String openBizType) {
         LambdaQueryWrapper<TzsUserInfo> userInfoQueryWrapper = new LambdaQueryWrapper<>();
         userInfoQueryWrapper.eq(TzsUserInfo::getUnitCode, unitCode);
         userInfoQueryWrapper.eq(BaseEntity::getIsDelete, false);
@@ -491,9 +491,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             List<TzsUserInfoVo> tzsUserInfoVos = userInfos.stream().map(userInfo -> {
                 TzsUserInfoVo vo = new TzsUserInfoVo();
                 BeanUtils.copyProperties(userInfo, vo, "identification", "profile", "permissionItem", "appointDoc");
-                if (!ObjectUtils.isEmpty(userInfo.getPermissionItem())) {
-                    vo.setPermissionItem(JSON.parseArray(userInfo.getPermissionItem()));
-                    vo.setPermissionItemName(this.castItemCode2Name(userInfo.getPermissionItem()));
+                if (!ObjectUtils.isEmpty(userInfo.getPermissionData())) {
+                    this.setPermissionInfo(vo, userInfo, openBizType);
                 }
                 if (!ObjectUtils.isEmpty(userInfo.getPost())) {
                     vo.setPost(JSON.parseArray(userInfo.getPost()));
@@ -501,7 +500,6 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 if (!ObjectUtils.isEmpty(userInfo.getAppointDoc())) {
                     vo.setAppointDoc(JSON.parseArray(userInfo.getAppointDoc()));
                 }
-                vo.setPermissionLevelName(this.getDictNameByCode(userInfo.getPermissionLevel()));
                 return vo;
             }).filter(o -> o.getPost() != null && (o.getPost().contains(jyUserPost) || o.getPost().contains(jcUserPost))).peek(u -> {
                 // 设置岗位类型，逻辑在1端处理，便于代码维护，前端直接使用即可【jy、jc对应前端的业务类型】
@@ -545,9 +543,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         return userInfos.stream().map(userInfo -> {
             TzsUserInfoVo vo = new TzsUserInfoVo();
             BeanUtils.copyProperties(userInfo, vo, "identification", "profile", "permissionItem", "appointDoc");
-            if (!ObjectUtils.isEmpty(userInfo.getPermissionItem())) {
-                vo.setPermissionItem(JSON.parseArray(userInfo.getPermissionItem()));
-                vo.setPermissionItemName(this.castItemCode2Name(userInfo.getPermissionItem()));
+            if (!ObjectUtils.isEmpty(userInfo.getPermissionData())) {
+                this.setPermissionInfo(vo, userInfo, personType);
             }
             if (!ObjectUtils.isEmpty(userInfo.getPost())) {
                 vo.setPost(JSON.parseArray(userInfo.getPost()));
@@ -555,12 +552,33 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             if (!ObjectUtils.isEmpty(userInfo.getAppointDoc())) {
                 vo.setAppointDoc(JSON.parseArray(userInfo.getAppointDoc()));
             }
-            vo.setPermissionLevelName(this.getDictNameByCode(userInfo.getPermissionLevel()));
             return vo;
         }).collect(Collectors.toList());
     }
 
-    private String castItemCode2Name(String permissionItem) {
+    private void setPermissionInfo(TzsUserInfoVo vo, TzsUserInfo userInfo, String personType) {
+        String post = "";
+        if (personType.equals(OpenBizTypeEnum.JY.getCode())) {
+            post = jyUserPost;
+        }
+        if (personType.equals(OpenBizTypeEnum.JC.getCode())) {
+            post = jcUserPost;
+        }
+        JSONObject allPermissionData = JSON.parseObject(userInfo.getPermissionData());
+        JSONArray postPermissionData = allPermissionData.getJSONArray(this.buildPermissionKey(post));
+        if (postPermissionData != null && postPermissionData.size() > 0) {
+            JSONObject jsonObject = postPermissionData.getJSONObject(0);
+            vo.setPermissionItem(jsonObject.getJSONArray("permissionItem"));
+            vo.setPermissionItemName(this.castItemCode2Name(jsonObject.getJSONArray("permissionItem")));
+            vo.setPermissionLevelName(this.getDictNameByCode(jsonObject.getString("permissionLevel")));
+        }
+    }
+
+    private String buildPermissionKey(String post) {
+        return String.format("%s%s", "permissionData", post);
+    }
+
+    private String castItemCode2Name(JSONArray permissionItem) {
         if (permissionItemList == null) {
             FeignClientResult<List<DictionarieValueModel>> itemDicts = Systemctl.dictionarieClient.dictValues(ZZXM_JYJC_DICT_KEY);
             permissionItemList = itemDicts.getResult();

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/TzsUserInfo.java

@@ -131,20 +131,28 @@ public class TzsUserInfo extends BaseEntity {
     private String innerPersonCode;
 
     /**
-     * 验检验专用-级别
+     * 证件照片
      */
+    @TableField(value = "appoint_doc")
+    private String appointDoc;
+
+    /**
+     * 验检验专用-级别-废弃，被permissionData替代
+     */
+    @Deprecated
     @TableField(value = "permission_level")
     private String permissionLevel;
 
     /**
-     * 验检验专用-资质项目
+     * 验检验专用-资质项目-废弃，被permissionData替代
      */
+    @Deprecated
     @TableField(value = "permission_item")
     private String permissionItem;
 
     /**
-     * 证件照片
+     * 验检验专用-资质数据json，替代：permission_level、permission_item
      */
-    @TableField(value = "appoint_doc")
-    private String appointDoc;
+    @TableField(value = "permission_data")
+    private String permissionData;
 }