告知流程代码

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DateUtils.java

@@ -25,6 +25,7 @@ public class DateUtils {
     public static final String MINUTE_ONLY_PATTERN = "mm";
     public static final String HOUR_ONLY_PATTERN = "HH";
     public static final String DATE_PATTERN_NUM = "yyyyMMdd";
+    public static final String DATE_PATTERN_MM = "yyyyMM";
     public static final String CHN_DATE_PATTERN_YEAR = "yyyy年";
     public static final String CHN_DATE_PATTERN_MONTH = "MM月";
     public static final String CHN_DATE_PATTERN = "yyyy年MM月dd日";

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

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "JgInstallationAccDto", description = "")
+public class JgInstallationAccDto {
+    String opinion;
+
+    JgInstallationNoticeDto model;
+}

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.dto;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -95,13 +96,13 @@ public class JgInstallationNoticeDto extends BaseDto {
     private String propertyUnitName;
 
     @ApiModelProperty(value = "使用单位id")
-    private String useUnitId;
+    private String useUnitCreditCode;
 
     @ApiModelProperty(value = "使用单位")
     private String useUnitName;
 
     @ApiModelProperty(value = "接收机构ID")
-    private String receiveOrgId;
+    private String receiveOrgCreditCode;
 
     @ApiModelProperty(value = "接收机构")
     private String receiveOrgName;
@@ -206,4 +207,7 @@ public class JgInstallationNoticeDto extends BaseDto {
                 + (StringUtils.isEmpty(this.countyName) ? "" : this.countyName)
                 + (StringUtils.isEmpty(this.address) ? "" : this.address);
     }
+   @ApiModelProperty(value = "设备注册代码")
+   private String equRegisterCode;
+
 }

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

@@ -224,115 +224,122 @@ public class JgInstallationNotice extends BaseEntity {
     /**
      * 撤销说明
      */
-    @TableField("cancel_remark")
+	@TableField("cancel_remark")
     private String cancelRemark;
 
     /**
      * 撤销处理截止日期
      */
-    @TableField("cancel_handle_deadline")
+	@TableField("cancel_handle_deadline")
     private Date cancelHandleDeadline;
 
     /**
      * 撤销流水号
      */
-    @TableField("cancel_process_no")
+	@TableField("cancel_process_no")
     private String cancelProcessNo;
 
     /**
      * 施工合同是否本单位与甲方直接签署
      */
-    @TableField("is_signed_with_a")
+	@TableField("is_signed_with_a")
     private String isSignedWithA;
 
     /**
      * 检验单位代码
      */
-    @TableField("inspect_unit_id")
+	@TableField("inspect_unit_id")
     private String inspectUnitId;
 
     /**
      * 检验单位
      */
-    @TableField("inspect_unit_name")
+	@TableField("inspect_unit_name")
     private String inspectUnitName;
 
     /**
      * 是否已报检
      */
-    @TableField("is_inspected")
+	@TableField("is_inspected")
     private String isInspected;
 
     /**
      * 设备安装质量证明书编号
      */
-    @TableField("install_cert_no")
+	@TableField("install_cert_no")
     private String installCertNo;
 
     /**
      * 审核通过时间
      */
-    @TableField("receive_time")
+	@TableField("receive_time")
     private Date receiveTime;
 
     /**
      * 状态
      */
-    @TableField("status")
+	@TableField("status")
     private String status;
 
     /**
      * 备注
      */
-    @TableField("remark")
+	@TableField("remark")
     private String remark;
 
     /**
      * 创建人ID
      */
-    @TableField("create_user_id")
+	@TableField("create_user_id")
     private String createUserId;
 
     /**
      * 创建时间
      */
-    @TableField("create_date")
+	@TableField("create_date")
     private Date createDate;
 
     /**
      * 录入单位ID
      */
-    @TableField("input_unit_no")
+	@TableField("input_unit_no")
     private String inputUnitNo;
 
     /**
      * 安装委托书图片
      */
-    @TableField("proxy_statement_attachment")
+	@TableField("proxy_statement_attachment")
     private String proxyStatementAttachment;
 
     /**
      * 安装合同照片
      */
-    @TableField("install_contract_attachment")
+	@TableField("install_contract_attachment")
     private String installContractAttachment;
 
     /**
      * 是否西咸
      */
-    @TableField("is_xixian")
+	@TableField("is_xixian")
     private String isXixian;
 
     /**
      * 告知日期
      */
-    @TableField("notice_date")
+	@TableField("notice_date")
     private Date noticeDate;
 
     /**
      * 流程实例id
      */
-    @TableField("instance_id")
+	@TableField("instance_id")
     private String instanceId;
 
+    /**
+     * 设备注册编码
+     */
+    @TableField("equ_register_code")
+    private String equRegisterCode;
+
+
 }

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

@@ -25,7 +25,12 @@ public enum  FlowStatusEnum {
     /**
      * 已驳回
      */
-    REJECTED(6614, "已驳回");
+    REJECTED(6614, "已驳回"),
+
+    /**
+     * 已撤回
+     */
+    ROBACK(6615, "已撤回");
 
     private final int code;
 

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

@@ -39,7 +39,7 @@
                 </if>
             </if>
             <if test="type == 'supervision'">
-                AND isn.notice_status in ('6612', '6613', '6614')
+                AND (isn.notice_status in ('6612', '6613', '6614') or isn.status in('6614') )
             </if>
         </where>
         ORDER BY

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

+package com.yeejoin.amos.boot.module.jg.biz.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationAccDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgInstallationNoticeServiceImpl;
+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-installation-workflow")
+public class JgInstallationByWorkFlowController {
+
+
+    @Autowired
+    JgInstallationNoticeServiceImpl jgInstallationNoticeServiceImpl;
+
+    /**
+     * 提交
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/submit")
+    @ApiOperation(httpMethod = "POST", value = "安装告知提交", notes = "安装告知提交")
+    public ResponseModel<JgInstallationNoticeDto> submit(@RequestBody JgInstallationNoticeDto model, String op) {
+        // TODO 发起安装告知流程
+        // jgInstallationNoticeServiceImpl.submit(model, op);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 撤销
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/cancel")
+    @ApiOperation(httpMethod = "POST", value = "安装告知撤销", notes = "安装告知撤销")
+    public ResponseModel<JgInstallationNoticeDto> cancel(@RequestBody Map<String, Object> model) {
+        JgInstallationNoticeDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("installationInfo")), JgInstallationNoticeDto.class, true);
+        if (Objects.isNull(installationInfo)) {
+            throw new IllegalArgumentException("参数installationInfo不能为空");
+        }
+        jgInstallationNoticeServiceImpl.cancel(installationInfo);
+        return ResponseHelper.buildResponse(installationInfo);
+    }
+
+    /**
+     * 受理
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/accept")
+    @ApiOperation(httpMethod = "POST", value = "安装告知受理", notes = "安装告知受理")
+    public ResponseModel<JgInstallationNoticeDto> accept(@RequestBody Map<String, Object> model, String op) {
+        // TODO 受理安装告知流程
+        LinkedHashMap model1 = (LinkedHashMap)model.get("model");
+        LinkedHashMap form = (LinkedHashMap)model1.get("form");
+        LinkedHashMap installationInfo = (LinkedHashMap)form.get("installationInfo");
+        JgInstallationNoticeDto jgInstallationNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgInstallationNoticeDto.class);
+        jgInstallationNoticeServiceImpl.accept(jgInstallationNoticeDto,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/feign/TzsServiceFeignClient.java

+package com.yeejoin.amos.boot.module.jg.biz.feign;
+
+
+import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.Map;
+
+@FeignClient(name = "TZS-YMT-LL", url = "172.16.3.155:11000", path = "/ymt", configuration =
+        {FeignConfiguration.class})
+public interface TzsServiceFeignClient {
+
+
+    /**
+     * 创建监管码及96333
+     *
+     * @param map 请求体
+     * @return
+     */
+    @RequestMapping(value = "/equipment-category/createSupervisorCode", method = RequestMethod.POST)
+    ResponseModel<Map<String, Object>> createCode(@RequestBody Map<String, Object> map);
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/logback-dev.xml

@@ -50,7 +50,7 @@
     <logger name="com.yeejoin" level="INFO"/>
 
     <!-- 日志输出级别 -->
-    <root level="DEBUG">
+    <root level="INFO">
         <!-- <appender-ref ref="FILE" /> -->
         <appender-ref ref="STDOUT" />
 <!--        <appender-ref ref="ELK" />-->