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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgEnableDisableDto.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 
@@ -75,4 +76,8 @@ public class JgEnableDisableDto  extends BaseDto {
     @ApiModelProperty(value = "申请类型（1启用，0停用）")
     private String applyType;
 
+
+    private List<String> roleIds;
+
+    private  String type;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/WorkFlowStatusEnum.java

@@ -71,7 +71,15 @@ public enum WorkFlowStatusEnum {
     UNITCHANGE_SUBMIT("使用单位提交", "unitChangeSubmit", "使用单位待提交", "一级受理已驳回", "使用单位已撤回"),
     UNITCHANGE_RECEIVE("一级受理", "unitChangeReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
     UNITCHANGE_PRELIMINARY("二级受理", "unitChangePreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
-    UNITCHANGE_REEXAMINE("三级受理", "unitChangeReexamine", "三级待受理","","");
+    UNITCHANGE_REEXAMINE("三级受理", "unitChangeReexamine", "三级待受理","",""),
+
+
+
+    /**
+     * 停用启用流程
+     */
+    ENABLE_SUBMIT("使用单位提交", "enableSubmit", "待提交", "已驳回", "已撤回"),
+    ENABLE_RECEIVE("监管受理", "enableReceive", "待受理", "", "");
 
 
     private final String name;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgEnableDisableMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgEnableDisableDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEnableDisable;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  *  Mapper 接口
@@ -11,4 +16,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface JgEnableDisableMapper extends BaseMapper<JgEnableDisable> {
 
+    Page<Map<String, Object>> pageList(@Param("page") Page<Map<String, Object>> page, @Param("dto") JgEnableDisableDto dto);
+
+    Map<String, Object> getDetail(@Param("sequenceNbr") Long sequenceNbr);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEnableDisableMapper.xml

@@ -2,4 +2,72 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgEnableDisableMapper">
 
+    <select id="pageList" resultType="java.util.Map">
+        SELECT jed.sequence_nbr                                                                              as sequenceNbr,
+               jed.apply_no                                                                                  as applyNo,
+               date_format(jed.apply_date, '%Y-%m-%d')                                                       as applyDate,
+               CASE
+                   when
+                       jed.apply_type = 1 then '停用'
+                   else '启用' end                                                                             as applyType,
+               jri.USE_ORG_CODE                                                                              as useOrgCode,
+               (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY)                        as equCategory,
+               (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE)                          as equDefine,
+               jri.PRODUCT_NAME                                                                              as productName,
+               use.USE_UNIT_NAME                                                                             as useUnitName,
+               jed.receive_org_name                                                                          as receiveOrgName,
+               concat(use."PROVINCE_NAME", '-', use."CITY_NAME", '-', use."COUNTY_NAME", '-', use."ADDRESS") as address,
+               use."USE_INNER_CODE"                                                                          as useInnerCode,
+               jed.audit_status                                                                              as auditStatus,
+               date_format(jed.audit_pass_date, '%Y-%m-%d')                                                  as auditPassDate,
+               jed.instance_id as instanceId,
+               jed.execute_sequence as executeSequence,
+               jed.next_executor_ids as nextExecutorIds,
+               jed.promoter
+
+        FROM tzs_jg_enable_disable jed
+                 LEFT JOIN tzs_jg_enable_disable_eq jede on jed.sequence_nbr = jede.enable_disable_apply_id
+                 LEFT JOIN idx_biz_jg_register_info jri on jede.equ_id = jri.RECORD
+                 LEFT JOIN idx_biz_jg_use_info use on jri.RECORD = use.RECORD
+        <where>
+            <if test="dto.applyNo != null and dto.applyNo != '' ">
+              and  jed.apply_no like concat('%',#{dto.applyNo},'%')
+            </if>
+            <if test="dto.applyNo != null and dto.applyNo != '' ">
+              and  jed.apply_no = #{dto.receiveOrgCode}
+            </if>
+            <if test="dto.auditStatus != null and dto.auditStatus != '' ">
+                and  jed.audit_status = #{dto.auditStatus}
+            </if>
+            <if test="dto.type == 'enterprise'">
+                and  jed.use_unit_credit_code = #{dto.useUnitCreditCode}
+            </if>
+            <if test="dto.type == 'supervision'">
+                and  jed.receive_org_code = #{dto.useUnitCreditCode}
+            </if>
+            <if test="dto.roleIds != null and dto.type == 'supervision'">
+                <foreach collection='dto.roleIds' item='role' open='and (' close=')' separator='or'>
+                    execute_sequence like concat('%',#{role},'%')
+                </foreach>
+            </if>
+        </where>
+        order by jed.rec_date desc
+    </select>
+    <select id="getDetail" resultType="java.util.Map">
+        SELECT jed.sequence_nbr        as sequenceNbr,
+               concat(jed.receive_org_code,'_',jed.receive_org_name)    as receiveOrgCode,
+               concat(use."PROVINCE_NAME", use."CITY_NAME", use."COUNTY_NAME", use."ADDRESS",
+                      use.STREET_NAME) as address,
+               jri.EQU_CODE            as equCode,
+               jed.apply_type          as applyType,
+               jed.remark,
+               use.RECORD              as record,
+               jfi.FACTORY_NUM         as factoryNum
+        FROM tzs_jg_enable_disable jed
+                 LEFT JOIN tzs_jg_enable_disable_eq jede on jed.sequence_nbr = jede.enable_disable_apply_id
+                 LEFT JOIN idx_biz_jg_register_info jri on jede.equ_id = jri.RECORD
+                 LEFT JOIN idx_biz_jg_use_info use on jri.RECORD = use.RECORD
+                 LEFT JOIN idx_biz_jg_factory_info jfi on jri.RECORD = jfi.RECORD
+        where jed.sequence_nbr = #{sequenceNbr}
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgEnableDisableController.java

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationEqDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgEnableDisable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
 import java.util.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgEnableDisableServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
+
 import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgEnableDisableDto;
@@ -18,8 +26,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
 /**
- * 
- *
  * @author system_generator
  * @date 2023-12-25
  */
@@ -37,80 +43,55 @@ public class JgEnableDisableController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<JgEnableDisableDto> save(@RequestBody JgEnableDisableDto model) {
-	    model = jgEnableDisableServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
-	}
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+    public ResponseModel<Object> save(@RequestBody JSONObject map) {
+        jgEnableDisableServiceImpl.saveOrUpdate(map);
+        return ResponseHelper.buildResponse("ok");
+    }
 
-	/**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-	public ResponseModel<JgEnableDisableDto> updateBySequenceNbrJgEnableDisable(@RequestBody JgEnableDisableDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(jgEnableDisableServiceImpl.updateWithModel(model));
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "使用登记设备关系表分页查询", notes = "使用登记设备关系表分页查询")
+    public ResponseModel<Page<Map<String, Object>>> page(@RequestParam(value = "current") int current,
+                                                         @RequestParam(value = "size") int size,
+                                                         JgEnableDisableDto dto) {
+        Page<Map<String, Object>> page = new Page<>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(jgEnableDisableServiceImpl.pageList(page, dto));
+    }
 
-	/**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(jgEnableDisableServiceImpl.removeById(sequenceNbr));
+    @PostMapping(value = "/flowExecute")
+    @ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
+    public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
+        jgEnableDisableServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))), String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("comment")));
+        return ResponseHelper.buildResponse("ok");
     }
 
-    /**
-     * 根据sequenceNbr查询
-     *
-	 * @param sequenceNbr  主键
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<JgEnableDisableDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(jgEnableDisableServiceImpl.queryBySeq(sequenceNbr));
-	}
 
-	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<JgEnableDisableDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<JgEnableDisableDto> page = new Page<JgEnableDisableDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(jgEnableDisableServiceImpl.queryForJgEnableDisablePage(page));
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/withdraw")
+    @ApiOperation(httpMethod = "POST", value = "撤回", notes = "撤回")
+    public ResponseModel<Object> withdraw(@RequestBody JSONObject map) {
+        jgEnableDisableServiceImpl.withdraw(String.valueOf(map.get("instanceId")));
+        return ResponseHelper.buildResponse("ok");
+    }
 
-	/**
-	 * 列表全部数据查询
-     *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<JgEnableDisableDto>> selectForList() {
-	    return ResponseHelper.buildResponse(jgEnableDisableServiceImpl.queryForJgEnableDisableList());
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/deleteMessage")
+    @ApiOperation(httpMethod = "DELETE", value = "删除", notes = "删除")
+    public ResponseModel<Object> deleteMessage(@RequestParam("sequenceNbr") Long sequenceNbr) {
+        jgEnableDisableServiceImpl.deleteMessage(sequenceNbr);
+        return ResponseHelper.buildResponse("ok");
+    }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/detail")
+    @ApiOperation(httpMethod = "GET", value = "详情", notes = "详情")
+    public ResponseModel<Object> detail(@RequestParam("sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(jgEnableDisableServiceImpl.getDetail(sequenceNbr));
+    }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgTransferNoticeController.java

@@ -8,6 +8,8 @@ import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgTransferNoticeService;
+import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
+import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -19,10 +21,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * 移装造告知
@@ -38,6 +37,9 @@ public class JgTransferNoticeController extends BaseController {
     @Autowired
     private IJgTransferNoticeService jgTransferNoticeService;
 
+    @Autowired
+    private ICommonService commonService;
+
     /**
      * 新增移装造告知
      *
@@ -158,6 +160,24 @@ public class JgTransferNoticeController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "特种设备登记证导出", notes = "特种设备登记证导出")
     @GetMapping(value = "/certificate/report")
     public ResponseModel<String> generateCertificateReport() {
-        return ResponseHelper.buildResponse("");
+        Map<String, Object> map = new HashMap<>();
+        // 组装模板变量
+        map.put("useRegistrationCode", "20231225123"); // 编号
+        map.put("useUnitName", "西安市高科物业服务有限公司");  // 使用单位名称
+        map.put("fullAddress", "西安市曲江新区春临东街南湖意境1单元2号楼");  // 设备使用地点
+        map.put("equList", "电梯");  // 设备种类
+        map.put("equipDefine", "曳引驱动乘客电梯");  // 设备品种
+        map.put("equipCode", "");  // 设备代码
+        map.put("equipCategory", "曳引电梯");  // 设备类别
+        map.put("useInnerCode", "KY-9527");  // 单位内编号
+        map.put("factoryNum", "G60001");  // 产品编号
+        map.put("receiveOrgName", "西安市曲江新区质检院");  // 登记机关
+        map.put("giveOutYear", "2023");  // 发证日期-年
+        map.put("giveOutMonth", "12");  // 发证日期-月
+        map.put("giveOutDay", "26");  // 发证日期-日
+        // 生成二维码
+        String qrCode = ImageUtils.generateQRCode("YZGZ20231225001", 70, 65);
+        map.put("supervisoryCode", qrCode);  // 监管二维码
+        return ResponseHelper.buildResponse(commonService.generateCertificateReport(map));
     }
 }

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

@@ -291,21 +291,21 @@ public class CommonServiceImpl implements ICommonService {
             throw new IllegalArgumentException("参数不能为空");
         }
         // 组装模板变量
-        map.put("useRegistrationCode", "20231225123"); // 编号
-        map.put("useUnitName", "西安市高科物业服务有限公司");  // 使用单位名称
-        map.put("fullAddress", "西安市曲江新区春临东街南湖意境1单元2号楼");  // 设备使用地点
-        map.put("equList", "电梯");  // 设备种类
-        map.put("equipDefine", "曳引驱动乘客电梯");  // 设备品种
-        map.put("equipCode", "");  // 设备代码
-        map.put("equipCategory", "曳引电梯");  // 设备类别
-        map.put("useInnerCode", "KY-9527");  // 单位内编号
-        map.put("factoryNum", "G60001");  // 产品编号
-        map.put("receiveOrgName", "西安市曲江新区质检院");  // 登记机关
-        map.put("giveOutYear", "2023");  // 发证日期-年
-        map.put("giveOutMonth", "12");  // 发证日期-月
-        map.put("giveOutDay", "26");  // 发证日期-日
+        map.put("useRegistrationCode", map.getOrDefault("useRegistrationCode", "").toString()); // 编号
+        map.put("useUnitName", map.getOrDefault("useUnitName", "").toString());  // 使用单位名称
+        map.put("fullAddress", map.getOrDefault("fullAddress", "").toString());  // 设备使用地点
+        map.put("equList", map.getOrDefault("equList", "").toString());  // 设备种类
+        map.put("equipDefine", map.getOrDefault("equipDefine", "").toString());  // 设备品种
+        map.put("equipCode", map.getOrDefault("equipCode", "").toString());  // 设备代码
+        map.put("equipCategory", map.getOrDefault("equipCategory", "").toString());  // 设备类别
+        map.put("useInnerCode", map.getOrDefault("useInnerCode", "").toString());  // 单位内编号
+        map.put("factoryNum", map.getOrDefault("factoryNum", "").toString());  // 产品编号
+        map.put("receiveOrgName", map.getOrDefault("receiveOrgName", "").toString());  // 登记机关
+        map.put("giveOutYear", map.getOrDefault("giveOutYear", "").toString());  // 发证日期-年
+        map.put("giveOutMonth", map.getOrDefault("giveOutMonth", "").toString());  // 发证日期-月
+        map.put("giveOutDay", map.getOrDefault("giveOutDay", "").toString());  // 发证日期-日
         // 生成二维码
-        String qrCode = ImageUtils.generateQRCode("YZGZ20231225001", 70, 65);
+        String qrCode = ImageUtils.generateQRCode(map.getOrDefault("supervisoryCode", "").toString(), 70, 65);
         map.put("supervisoryCode", qrCode);  // 监管二维码
 
         // word转pdf

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java

@@ -28,6 +28,7 @@ public enum ApplicationFormTypeEnum {
     JG("JG"),// 检验结果
     SBZX("SBZX"),//电梯（设备）注销
     GMBG("GMBG"),//更名变更
+    TYQY("TYQY")//停用启用
     ;
 
     /**