维修告知接口调整

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 维修告知
@@ -15,7 +19,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JgMaintainNoticeDto", description="维修告知")
+@ApiModel(value = "JgMaintainNoticeDto", description = "维修告知")
 public class JgMaintainNoticeDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
@@ -117,6 +121,12 @@ public class JgMaintainNoticeDto  extends BaseDto {
     @ApiModelProperty(value = "施工合同附件")
     private String constructionContract;
 
+    @ApiModelProperty(value = "委托书附件")
+    private List<Map<String, Object>> powerOfAttorneyList;
+
+    @ApiModelProperty(value = "施工合同附件")
+    private List<Map<String, Object>> constructionContractList;
+
     @ApiModelProperty(value = "施工合同是否本单位与甲方直接签署")
     private String isSignedWithA;
 
@@ -135,4 +145,7 @@ public class JgMaintainNoticeDto  extends BaseDto {
     @ApiModelProperty(value = "接收机构机构代码")
     private String receiveOrgCode;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "告知设备列表")
+    private List<Map<String, Object>> deviceList;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgMaintainNotice.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
 
 /**

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNoticeEq;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 维修告知设备关系表 Mapper 接口
@@ -9,6 +8,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author system_generator
  * @date 2023-12-19
  */
-public interface JgMaintainNoticeEqMapper extends BaseMapper<JgMaintainNoticeEq> {
+public interface JgMaintainNoticeEqMapper extends CustomBaseMapper<JgMaintainNoticeEq> {
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgMaintainNoticeMapper.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.JgMaintainNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
- * 维修告知 Mapper 接口
+ * Mapper 接口
  *
  * @author system_generator
- * @date 2023-12-19
+ * @date 2023-12-12
+ */
+public interface JgMaintainNoticeMapper extends CustomBaseMapper<JgMaintainNotice> {
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param model 查询参数
+     * @param type  类型：enterprise-企业端、supervision-监管端
+     * @return 维修告知列表
      */
-public interface JgMaintainNoticeMapper extends BaseMapper<JgMaintainNotice> {
+    Page<JgMaintainNotice> queryForPage(Page<JgMaintainNotice> page, @Param("param") JgMaintainNoticeDto model, @Param("type") String type, @Param("orgCode") String orgCode);
 
+    /**
+     * 根据维修告知编号查询设备、设计、制造等信息
+     *
+     * @param sequenceNbr 维修告知编号
+     */
+    @MapKey("sequenceNbr")
+    List<Map<String, Object>> queryEquipInformation(@Param("sequenceNbr") long sequenceNbr);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgMaintainNoticeService.java

 package com.yeejoin.amos.boot.module.jg.api.service;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
+
+import java.util.Map;
+
 /**
- * 维修告知接口类
+ * 接口类
  *
  * @author system_generator
- * @date 2023-12-19
+ * @date 2023-12-12
+ */
+public interface IJgMaintainNoticeService extends IService<JgMaintainNotice> {
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return 维修告知
      */
-public interface IJgMaintainNoticeService {
+    Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr);
 
+    /**
+     * 更新维修告知
+     *
+     * @param noticeDto 维修告知
+     * @param op        操作类型
+     */
+    JgMaintainNoticeDto updateMaintainNotice(String submitType, JgMaintainNoticeDto noticeDto, String op);
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param model 查询参数
+     * @param type  类型：enterprise-企业端、supervision-监管端
+     * @return 维修告知列表
+     */
+    Page<JgMaintainNoticeDto> queryForJgMaintainNoticePage(Page<JgMaintainNotice> page, JgMaintainNoticeDto model, String type, ReginParams reginParams);
+
+    /**
+     * 批量删除
+     *
+     * @param sequenceNbrs 主键
+     * @return 是否删除成功
+     */
+    Boolean deleteForBatch(Long[] sequenceNbrs);
+
+    /**
+     * 保存维修告知单
+     *
+     * @param model      数据
+     * @param submitType 保存类型
+     */
+    void saveNotice(String submitType, Map<String, JgMaintainNoticeDto> model, ReginParams reginParams);
+
+    /**
+     * 打印告知单
+     *
+     * @param sequenceNbr 主键
+     * @return pdf文件路径
+     */
+    String generateMaintainNoticeReport(Long sequenceNbr);
 }

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

@@ -2,4 +2,109 @@
 <!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.JgMaintainNoticeMapper">
 
+    <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice">
+        select
+        tjmn.sequence_nbr AS sequenceNbr,
+        tjmn.apply_no AS applyNo,
+        tjmn.supervisory_code AS supervisoryCode,
+        tjmn.notice_date AS noticeDate,
+        tjmn.use_unit_name AS useUnitName,
+        tjmn.receive_org_name AS receiveOrgName,
+        tjmn.region_no AS regionNo,
+        tjmn.address AS address,
+        tjmn.notice_status AS noticeStatus,
+        tjmn.install_unit_name AS installUnitName,
+        tjmn.province_name AS provinceName,
+        tjmn.city_name AS cityName,
+        tjmn.county_name AS countyName,
+        tjmn.instance_id AS instanceId,
+        tjmn.notice_report_url AS noticeReportUrl
+        FROM
+        tzs_jg_maintain_notice tjmn
+        <where>
+            tjmn.is_delete = false
+            <if test="param != null ">
+                <if test="param.applyNo != null and param.applyNo != ''">
+                    AND tjmn.apply_no LIKE CONCAT('%', #{param.applyNo}, '%')
+                </if>
+                <if test="param.receiveOrgName != null and param.receiveOrgName != ''">
+                    AND tjmn.receive_org_name LIKE CONCAT('%', #{param.receiveOrgName}, '%')
+                </if>
+                <if test="param.useUnitName != null and param.useUnitName != ''">
+                    AND tjmn.use_unit_name LIKE CONCAT('%', #{param.useUnitName}, '%')
+                </if>
+                <if test="param.installUnitName != null and param.installUnitName != ''">
+                    AND tjmn.install_unit_name LIKE CONCAT('%', #{param.installUnitName}, '%')
+                </if>
+                <if test="param.noticeStatus != null and param.noticeStatus != ''">
+                    AND tjmn.notice_status = #{param.noticeStatus}
+                </if>
+            </if>
+            <if test="type == 'supervision'">
+                AND (tjmn.notice_status in ('6612', '6613', '6614') or tjmn.status in('6614') )
+            </if>
+            <if test="orgCode != null and orgCode != ''">
+                AND tjmn.install_unit_credit_code = #{orgCode}
+            </if>
+        </where>
+        ORDER BY
+        tjmn.notice_date DESC
+    </select>
+
+    <select id="queryEquipInformation" resultType="java.util.Map">
+        select
+            tjmn.sequence_nbr AS sequenceNbr,
+            tjmn.install_unit_name AS installUnitName,
+            tjmn.apply_no AS applyNo,
+            tjmn.province,
+            tjmn.city AS cityName,
+            tjmn.county AS countyName,
+            tjmn.address AS address,
+            tjmn.use_unit_name AS useUnitName,
+            ri.equ_list AS equList,
+            ri.equ_category AS equCategory,
+            ri.EQU_DEFINE AS equDefine,
+            ri.product_name AS productName,
+            ri.brand_name AS brandName,
+            ri.equ_type AS equType,
+            ri.equ_price AS equPrice,
+            ri.product_photo AS productPhoto,
+            di.design_unit_credit_code AS designUnitCreditCode,
+            di.design_unit_name AS designUnitName,
+            di.design_license_num AS designLicenseNum,
+            di.design_use_date AS designUseDate,
+            di.design_date AS designDate,
+            di.drawing_do AS drawingDo,
+            di.appraisal_unit AS appraisalUnit,
+            di.appraisal_date AS appraisalDate,
+            di.design_doc AS designDoc,
+            di.design_standard AS designStandard,
+            fi.produce_unit_credit_code AS produceUnitCreditCode,
+            fi.produce_unit_name AS produceUnitName,
+            fi.produce_license_num AS produceLicenseNum,
+            fi.factory_num AS factoryNum,
+            fi.produce_date AS produceDate,
+            fi.imported AS imported,
+            fi.produce_country AS produceCountry,
+            fi.factory_standard AS factoryStandard,
+            fi.product_quality_yield_prove AS productQualityYieldProve,
+            fi.ins_use_maintain_explain AS insUseMaintainExplain,
+            ui.safety_manager AS safetyManager,
+            ui.phone AS safetyManagerPhone,
+            ui.PROVINCE_NAME AS useUnitProvinceName,
+            ui.CITY_NAME AS useUnitCityName,
+            ui.COUNTY_NAME AS useUnitCountyName,
+            ui.ADDRESS AS useUnitAddress
+        FROM
+            tzs_jg_maintain_notice tjmn
+                LEFT JOIN tzs_jg_installation_notice_eq re ON re.equip_transfer_id = tjmn.sequence_nbr
+                LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
+                LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
+                LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
+                LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
+                LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
+        WHERE
+            tjmn.sequence_nbr = #{sequenceNbr}
+            LIMIT 1
+    </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/JgMaintainByWorkFlowController.java

+package com.yeejoin.amos.boot.module.jg.biz.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgMaintainNoticeServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 维修告知
+ *
+ * @author system_generator
+ * @date 2023-12-12
+ */
+@RestController
+@Api(tags = "维修告知工作流相关Api")
+@RequestMapping(value = "/jg-maintain-workflow")
+public class JgMaintainByWorkFlowController {
+
+    @Autowired
+    JgMaintainNoticeServiceImpl jgMaintainNoticeServiceImpl;
+
+    /**
+     * 提交
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/submit")
+    @ApiOperation(httpMethod = "POST", value = "维修告知提交", notes = "维修告知提交")
+    public ResponseModel<JgMaintainNoticeDto> submit(@RequestBody JgMaintainNoticeDto model, String op) {
+        // TODO 发起维修告知流程
+        // jgMaintainNoticeServiceImpl.submit(model, op);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 撤销
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/cancel")
+    @ApiOperation(httpMethod = "POST", value = "维修告知撤销", notes = "维修告知撤销")
+    public ResponseModel<JgMaintainNoticeDto> cancel(@RequestBody Map<String, Object> model) {
+        JgMaintainNoticeDto maintainInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("maintainInfo")), JgMaintainNoticeDto.class, true);
+        if (Objects.isNull(maintainInfo)) {
+            throw new IllegalArgumentException("参数maintainInfo不能为空");
+        }
+        jgMaintainNoticeServiceImpl.cancel(maintainInfo);
+        return ResponseHelper.buildResponse(maintainInfo);
+    }
+
+    /**
+     * 受理
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/accept")
+    @ApiOperation(httpMethod = "POST", value = "维修告知受理", notes = "维修告知受理")
+    public ResponseModel<JgMaintainNoticeDto> accept(@RequestBody Map<String, Object> model, String op) {
+        // TODO 受理维修告知流程
+        LinkedHashMap model1 = (LinkedHashMap) model.get("model");
+        LinkedHashMap maintainInfo = (LinkedHashMap) model1.get("maintainInfo");
+        JgMaintainNoticeDto jgMaintainNoticeDto = JSON.parseObject(JSON.toJSONString(maintainInfo), JgMaintainNoticeDto.class);
+        jgMaintainNoticeServiceImpl.accept(jgMaintainNoticeDto, op);
+        return ResponseHelper.buildResponse(null);
+    }
+}

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
-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.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeEqDto;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgMaintainNoticeEqServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 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.JgMaintainNoticeEqDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * 维修告知设备关系表
  *
  * @author system_generator
- * @date 2023-12-19
+ * @date 2023-12-18
  */
 @RestController
 @Api(tags = "维修告知设备关系表Api")
@@ -53,7 +52,7 @@ public class JgMaintainNoticeEqController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维修告知设备关系表", notes = "根据sequenceNbr更新维修告知设备关系表")
-	public ResponseModel<JgMaintainNoticeEqDto> updateBySequenceNbrJgMaintainNoticeEq(@RequestBody JgMaintainNoticeEqDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+    public ResponseModel<JgMaintainNoticeEqDto> updateBySequenceNbrJgMaintainNoticeEq(@RequestBody JgMaintainNoticeEqDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         model.setSequenceNbr(sequenceNbr);
         return ResponseHelper.buildResponse(jgMaintainNoticeEqServiceImpl.updateWithModel(model));
     }
@@ -67,7 +66,7 @@ public class JgMaintainNoticeEqController extends BaseController {
     @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){
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(jgMaintainNoticeEqServiceImpl.removeById(sequenceNbr));
     }
 
@@ -79,7 +78,7 @@ public class JgMaintainNoticeEqController extends BaseController {
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个维修告知设备关系表",  notes = "根据sequenceNbr查询单个维修告知设备关系表")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个维修告知设备关系表", notes = "根据sequenceNbr查询单个维修告知设备关系表")
     public ResponseModel<JgMaintainNoticeEqDto> selectOne(@PathVariable Long sequenceNbr) {
         return ResponseHelper.buildResponse(jgMaintainNoticeEqServiceImpl.queryBySeq(sequenceNbr));
     }
@@ -93,8 +92,8 @@ public class JgMaintainNoticeEqController extends BaseController {
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "维修告知设备关系表分页查询",  notes = "维修告知设备关系表分页查询")
-	public ResponseModel<Page<JgMaintainNoticeEqDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+    @ApiOperation(httpMethod = "GET", value = "维修告知设备关系表分页查询", notes = "维修告知设备关系表分页查询")
+    public ResponseModel<Page<JgMaintainNoticeEqDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
             (value = "size") int size) {
         Page<JgMaintainNoticeEqDto> page = new Page<JgMaintainNoticeEqDto>();
         page.setCurrent(current);
@@ -108,7 +107,7 @@ public class JgMaintainNoticeEqController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "维修告知设备关系表列表全部数据查询",   notes = "维修告知设备关系表列表全部数据查询")
+    @ApiOperation(httpMethod = "GET", value = "维修告知设备关系表列表全部数据查询", notes = "维修告知设备关系表列表全部数据查询")
     @GetMapping(value = "/list")
     public ResponseModel<List<JgMaintainNoticeEqDto>> selectForList() {
         return ResponseHelper.buildResponse(jgMaintainNoticeEqServiceImpl.queryForJgMaintainNoticeEqList());