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

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionApplicationMapper.java

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEqui
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
 import org.springframework.data.repository.query.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -19,6 +20,7 @@ public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspecti
 
 
    public Page<JyjcInspectionApplicationModel> queryForDataList( Page<JyjcInspectionApplication> page, String applicationNo, String inspectionClassify, String applicationUnitCode,String applicationUnitName, String equipClassify, String inspectionUnitCode,String inspectionUnitName, String applicationDate, String acceptDate, String inspectionChargePerson, String status , String bizType);
+//   public Page<JyjcInspectionApplicationModel> queryForDataList( Page<JyjcInspectionApplication> page, String applicationNo, String inspectionClassify, String applicationUnitCode,String applicationUnitName, String equipClassify, String inspectionUnitCode,String inspectionUnitName, String applicationDate, String acceptDate, String inspectionChargePerson, String status , String bizType, List<String> roleIds);
 
    Page<JyjcInspectionApplicationEquipModel> listByCategory(Page<JyjcInspectionApplicationEquipModel> page,@Param("equipClassify")  String equipClassify);
 

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

@@ -47,7 +47,7 @@
             and inspection_unit_code in (select use_code from tz_base_enterprise_info where use_unit like concat('%',#{inspectionUnitName},'%'))
         </if>
         <if test="inspectionUnitCode != null and inspectionUnitCode != ''">
-            and inspection_unit_code = #{inspectionUnitCode}
+            and inspection_unit_code = #{inspectionUnitCode} and status != '6610'
         </if>
         <if test="applicationUnitCode != null and applicationUnitCode != ''">
             and application_unit_code = #{applicationUnitCode}
@@ -73,6 +73,11 @@
         <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>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
@@ -15,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -50,6 +53,14 @@ public class JyjcInspectionApplicationController extends BaseController {
 
 		ReginParams selectedOrgInfo = getSelectedOrgInfo();
 		model.put("applicationUnitCode",selectedOrgInfo.getCompany().getCompanyCode());
+
+		if (model.get("operationType").toString().equals("2") || model.get("operationType").toString().equals("0")){
+
+			if(null == model.get("equip") ||model.getJSONArray("equip").size() < 1 ){
+					return CommonResponseUtil.failure("未选择报检设备时不可提交");
+			}
+
+		}
 		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.save(model));
     }
 
@@ -133,14 +144,16 @@ public class JyjcInspectionApplicationController extends BaseController {
 											  @RequestParam(required = false) String applicationDate,
 											  @RequestParam(required = false) String acceptDate,
 											  @RequestParam(required = false) String inspectionChargePerson,
-											  @RequestParam(required = false) String status , String bizType) {
+											  @RequestParam(required = false) String status ,
+											 @RequestParam(required = false) String roles,	  String bizType) {
 	    Page<JyjcInspectionApplication> page = new Page<JyjcInspectionApplication>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 
 		ReginParams reginParams = getSelectedOrgInfo();
 		inspectionUnitCode = reginParams.getCompany().getCompanyCode();
-		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,equipClassify,inspectionUnitCode,applicationUnitName,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType));
+		List<String> roleIds = StrUtil.split(roles, ",");
+		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,equipClassify,inspectionUnitCode,applicationUnitName,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType ));
 	}
 
 
@@ -158,13 +171,17 @@ public class JyjcInspectionApplicationController extends BaseController {
 																				@RequestParam(required = false) String applicationDate,
 																				@RequestParam(required = false) String acceptDate,
 																				@RequestParam(required = false) String inspectionChargePerson,
+																					 @RequestParam(required = false) String roles,
 																					 @RequestParam(required = false) String status , String bizType) {
 		Page<JyjcInspectionApplication> page = new Page<JyjcInspectionApplication>();
 		page.setCurrent(current);
 		page.setSize(size);
 		ReginParams reginParams = getSelectedOrgInfo();
 		applicationUnitCode = reginParams.getCompany().getCompanyCode();
+			List<String> roleIds = StrUtil.split(roles, ",");
+//			return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,equipClassify,inspectionUnitCode,applicationUnitName,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType,roleIds));
 			return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,equipClassify,inspectionUnitCode,applicationUnitName,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType));
+
 	}
 
 			/**

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/JyjcInspectionApplicationServiceImpl.java

@@ -104,10 +104,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         if (!model.getOperationType().equals("2")) {
             if (model.getOperationType().equals("0")) {
 
-                if(null == model.getEquip() ||model.getEquip().size() < 1 ){
-                    throw  new BadRequest("未选择报检设备时不可提交");
-                }
-
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 dto.setProcessDefinitionKey( model.getProcessKey());
                 dto.setBusinessKey(buildOrderNo());
@@ -134,7 +130,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 }
              model.setStatus(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode())); //6611 对应数据字典 检验流程状态 待受理
             } else if (model.getOperationType().equals("1")) {
-                model.setStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
 
             LambdaQueryWrapper<JyjcOpeningApplication> wa = new LambdaQueryWrapper<JyjcOpeningApplication>().eq(JyjcOpeningApplication::getUnitCode, model.getInspectionUnitCode()).eq(JyjcOpeningApplication::getStatus, FlowStatusEnum.TO_BE_FINISHED.getCode());
@@ -149,7 +144,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
             model.setApplicationNo(codes.get(0));
             model.setApplicationDate(new Date());
-
             model.setPromoter(reginParams.getUserModel().getUserId());
 
 
@@ -172,6 +166,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             // endregion
 
             if (null == model.getSequenceNbr()){
+                model.setStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
                 model = this.createWithModel(model);
             }else {
                 model = this.updateWithModel(model);
@@ -297,9 +292,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                                                                                  String applicationDate,
                                                                                  String acceptDate,
                                                                                  String inspectionChargePerson,
-                                                                                 String status, String bizType) {
+                                                                                 String status, String bizType ) {
 
-        return this.getBaseMapper().queryForDataList(page, applicationNo, inspectionClassify, applicationUnitCode, applicationUnitName, equipClassify, inspectionUnitCode, inspectionUnitName, applicationDate, acceptDate, inspectionChargePerson, status, bizType);
+//        return this.getBaseMapper().queryForDataList(page, applicationNo, inspectionClassify, applicationUnitCode, applicationUnitName, equipClassify, inspectionUnitCode, inspectionUnitName, applicationDate, acceptDate, inspectionChargePerson, status, bizType,roleIds);
+        return this.getBaseMapper().queryForDataList(page, applicationNo, inspectionClassify, applicationUnitCode, applicationUnitName, equipClassify, inspectionUnitCode, inspectionUnitName, applicationDate, acceptDate, inspectionChargePerson, status, bizType );
 
     }
 
@@ -512,7 +508,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
        //此处自己撤销也赋予了办理日期 存在问题 与驳回 通过区分处理
         if (rollBack) {
             this.getBaseMapper().updatePromoter(entity.getSequenceNbr());
-        }else {
+        }
+        //逻辑变更为 通过后才对办理时间赋值
+        if (status.equals(FlowStatusEnum.TO_BE_FINISHED.getCode())){
             entity.setAcceptDate(new Date());
         }
         this.updateById(entity);