Merge branch 'develop_tzs_register' of…

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

@@ -6,50 +6,51 @@
     <select id="selectJyjcOpeningApplicationList"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel">
         select
-        unit_code,
-        detection_region,
-        detection_region_name,
-        application_seq,
-        result_type,
-        expiry_date,
-        accept_date,
-        status,
-        remark,
-        sequence_nbr,
-        rec_date,
-        rec_user_id,
-        rec_user_name,
-        apply_time,
-        workflow_prostance_id,
-        workflow_role,
-        unit_code_name,
-        status_name,
-        workflow_active_key,
-        next_execute_ids,
-        promoter,
-        create_user_id
-        from tz_jyjc_opening_application
+        a.unit_code,
+        a.detection_region,
+        a.detection_region_name,
+        a.application_seq,
+        a.result_type,
+        a.expiry_date,
+        a.accept_date,
+        a.status,
+        a.remark,
+        a.sequence_nbr,
+        a.rec_date,
+        a.rec_user_id,
+        a.rec_user_name,
+        a.apply_time,
+        a.workflow_prostance_id,
+        a.workflow_role,
+        a.unit_code_name,
+        cdd2.NAME as status_name,
+        a.workflow_active_key,
+        a.next_execute_ids,
+        a.promoter,
+        a.create_user_id
+        from tz_jyjc_opening_application a
+            LEFT JOIN cb_data_dictionary cdd2 ON cdd2.code = a.status and cdd2.type = 'JYLCSQ'
         <where>
             <if test="jyjcOpeningApplicationRequstDto.applicationSeq != '' and jyjcOpeningApplicationRequstDto.applicationSeq != null">
-                and application_seq like concat('%',#{jyjcOpeningApplicationRequstDto.applicationSeq},'%')
+                and a.application_seq like concat('%',#{jyjcOpeningApplicationRequstDto.applicationSeq},'%')
             </if>
             <if test="jyjcOpeningApplicationRequstDto.unitCode != '' and jyjcOpeningApplicationRequstDto.unitCode != null">
-                and unit_code like concat('%',#{jyjcOpeningApplicationRequstDto.unitCode},'%')
+                and a.unit_code like concat('%',#{jyjcOpeningApplicationRequstDto.unitCode},'%')
             </if>
             <if test="jyjcOpeningApplicationRequstDto.acceptDate != '' and jyjcOpeningApplicationRequstDto.acceptDate != null">
-                and accept_date = #{jyjcOpeningApplicationRequstDto.acceptDate},
+                and a.accept_date = #{jyjcOpeningApplicationRequstDto.acceptDate}
             </if>
             <if test="jyjcOpeningApplicationRequstDto.status != '' and jyjcOpeningApplicationRequstDto.status != null">
-                and status = #{jyjcOpeningApplicationRequstDto.status}
+                and a.status = #{jyjcOpeningApplicationRequstDto.status}
             </if>
             <if test="applyendTime != '' and applyendTime != null">
-                and apply_time &lt;= #{applyendTime}
+                and a.apply_time &lt;= #{applyendTime}
             </if>
             <if test="applyStartTime != '' and applyStartTime != null">
-                and apply_time &gt;=#{applyStartTime}
+                and a.apply_time &gt;=#{applyStartTime}
             </if>
             <if test="jyjcOpeningApplicationRequstDto.type == 'supervision'">
-                and status not in ('6610')
+                and a.status not in ('6610')
             </if>
         </where>
         order by sequence_nbr desc

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

@@ -229,6 +229,16 @@ public class JyjcOpeningApplicationController extends BaseController {
 		return ResponseHelper.buildResponse(roleIds);
 	}
 
+	/**
+	 * 废弃接口, 已替换成公共接口
+	 *
+	 *
+	 * @param
+	 * @return {@link  ResponseModel< List< Map< String  Object>>>}
+	 * @author yangyang
+	 * @throws
+	 */
+	@Deprecated
 	@TycloudOperation (ApiLevel = UserType.AGENCY)
 	@ApiOperation (httpMethod = "GET", value = "办理状态枚举列表", notes = "办理状态枚举列表")
 	@GetMapping (value = "/flow-status/list")

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

@@ -120,7 +120,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                     instanceId = startFlow("1");
                 }
                 model.setStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode() + "");
-                model.setStatusName(FlowStatusEnum.TO_BE_PROCESSED.getName());
+                // model.setStatusName(FlowStatusEnum.TO_BE_PROCESSED.getName());
                 model.setApplyTime(new Date());
                 model.setWorkflowProstanceId(instanceId);
                 // 默认自动执行第一步
@@ -139,7 +139,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 // 只有第一次改为待提交
                 if (entity == null) {
                     model.setStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode() + "");
-                    model.setStatusName(FlowStatusEnum.TO_BE_SUBMITTED.getName());
+                    // model.setStatusName(FlowStatusEnum.TO_BE_SUBMITTED.getName());
                 }
             }
             if (!isUpdate) {
@@ -164,7 +164,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     @Transactional(rollbackFor = {Exception.class, BaseException.class})
     public JyjcOpeningApplicationModel resubmit(JyjcOpeningApplicationModel model) {
         model.setStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode() + "");
-        model.setStatusName(FlowStatusEnum.TO_BE_PROCESSED.getName());
+        // model.setStatusName(FlowStatusEnum.TO_BE_PROCESSED.getName());
         model = this.updateWithModel(model);
         execueFlow(MapBuilder.<String, Object>create().put("op", "0").put("instanceId", model.getWorkflowProstanceId()).put("comments", "").build());
         return model;
@@ -195,7 +195,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             entity.setWorkflowRole(role);
         }
         entity.setStatus(status);
-        entity.setStatusName(FlowStatusEnum.getNameByType(Long.parseLong(status)));
+        // entity.setStatusName(FlowStatusEnum.getNameByType(Long.parseLong(status)));
         // region 更新其他的数据为已作废
         if (String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()).equals(status)) {
             doDiscard(entity.getUnitCode(), entity.getSequenceNbr());