20221021

项目登记报告签发

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/domain/ProgramProjectListInfo.java

@@ -238,6 +238,12 @@ public class ProgramProjectListInfo {
     private String status3;
 
     /**
+     * 报告签发状态
+     */
+    @TableField(exist = false)
+    private String issuedStatus;
+
+    /**
      * 一级校审id
      */
     @TableField(exist = false)
@@ -256,6 +262,12 @@ public class ProgramProjectListInfo {
     private String auditId3;
 
     /**
+     * 报告签发id
+     */
+    @TableField(exist = false)
+    private String issuedId;
+
+    /**
      * 三级校审流程id
      */
     @TableField(exist = false)
@@ -297,4 +309,10 @@ public class ProgramProjectListInfo {
     @TableField(exist = false)
     private String OfficeId;
 
+    /**
+     * 报告签发流程id
+     */
+    @TableField(exist = false)
+    private String procInsId4;
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/mapper/xml/ProjectListMapper.xml

@@ -128,7 +128,10 @@
            pa3.proc_ins_id as procInsId3,
            pa.status as archive_status,
            pa.id as archive_id,
-           pa.proc_ins_id as procInsIdArchive
+           pa.proc_ins_id as procInsIdArchive,
+           d.id AS issued_id,
+           d.proc_ins_id AS procInsId4,
+           d.status AS issued_status
         FROM
             program_project_list_info a
             LEFT JOIN sys_user b ON a.create_by = b.id
@@ -138,6 +141,7 @@
             LEFT JOIN program_audit pa2 ON pa2.program_id = a.id and pa2.audit_level = '2' and pa2.del_flag = '0'
             LEFT JOIN program_audit pa3 ON pa3.program_id = a.id and pa3.audit_level = '3' and pa3.del_flag = '0'
             LEFT JOIN program_archive pa ON pa.program_id = a.id and pa.del_flag = '0'
+            LEFT JOIN proofread_issued d ON a.id = d.project_id
             ${ew.customSqlSegment}
             ORDER BY a.update_date DESC
     </select>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/proofread/controller/ProofreadIssuedController.java

@@ -0,0 +1,68 @@
+package com.jeeplus.test.proofread.controller;
+
+import com.jeeplus.common.utils.ResponseUtil;
+import com.jeeplus.test.proofread.domain.ProofreadIssued;
+import com.jeeplus.test.proofread.service.ProofreadIssuedService;
+import com.jeeplus.test.proofread.service.dto.ProofreadInfoDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@Api(tags ="报告签发单")
+@RequestMapping(value = "/proofread/issued")
+public class ProofreadIssuedController {
+
+    @Resource
+    private ProofreadIssuedService service;
+
+    /**
+     * 新增/修改
+     * @param issued
+     * @return
+     */
+    @ApiOperation(value = "新增/修改")
+    @PostMapping("/save")
+    public ResponseEntity<String> save(@RequestBody ProofreadIssued issued) {
+        String s = service.save(issued);
+        return ResponseUtil.newInstance().add("businessTable", "proofread_issued").add("businessId", s).ok ("操作成功");
+    }
+
+    /**
+     * 根据项目id查询
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "根据项目id查询")
+    @GetMapping("/findById")
+    public ResponseEntity<ProofreadIssued> findById(String id) {
+        ProofreadIssued info = service.findById(id);
+        return ResponseEntity.ok(info);
+    }
+
+    /**
+     * 根据项目id查询初始化信息
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "根据项目id查询初始化信息")
+    @GetMapping("/findProjectInfoById")
+    public ResponseEntity<ProofreadIssued> findProjectInfoById(String id) {
+        ProofreadIssued info = service.findProjectInfoById(id);
+        return ResponseEntity.ok(info);
+    }
+
+    /**
+     * 根据项目id修改状态值
+     * @param issued
+     * @return
+     */
+    @ApiOperation(value = "根据项目id修改状态值")
+    @PostMapping("/updateStatusById")
+    public void updateStatusById(@RequestBody ProofreadIssued issued) {
+        service.updateStatusById(issued);
+    }
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/proofread/domain/ProofreadIssued.java

@@ -0,0 +1,124 @@
+package com.jeeplus.test.proofread.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@TableName(value = "proofread_issued")
+public class ProofreadIssued extends BaseEntity {
+
+    /**
+     * 项目id
+     */
+    private String projectId;
+
+    /**
+     * 项目名称
+     */
+    @TableField(exist = false)
+    private String projectName;
+
+    /**
+     * 评估基准日
+     */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date assessmentDate;
+
+    /**
+     * 报告文号
+     */
+    @TableField(exist = false)
+    private String reportNo;
+
+    /**
+     * 项目负责人id
+     */
+    @TableField(exist = false)
+    private String projectManager;
+
+    /**
+     * 项目负责人
+     */
+    @TableField(exist = false)
+    private String projectManagerName;
+
+    /**
+     * 所属部门
+     */
+    @TableField(exist = false)
+    private String department;
+
+    /**
+     * 是否填写台账
+     */
+    private String isTxtz;
+
+    /**
+     * 报告电子档是否归档
+     */
+    private String isBgdzdgd;
+
+    /**
+     * 是否需要备案
+     */
+    private String isXyba;
+
+    /**
+     * 是否完成备案
+     */
+    private String isWcba;
+
+    /**
+     * 用印类型
+     */
+    private String sealType;
+
+    /**
+     * 评估报告（份）
+     */
+    private String assessmentReport;
+
+    /**
+     * 评估说明（份）
+     */
+    private String assessmentExplain;
+
+    /**
+     * 评估明细表（份）
+     */
+    private String assessmentDetail;
+
+    /**
+     * 咨询报告（份）
+     */
+    private String consultingReport;
+
+    /**
+     * 审批状态
+     */
+    private String status;
+
+    /**
+     * 审批通过时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date agreeTime;
+
+    /**
+     * 流程id
+     */
+    private String procInsId;
+
+    /**
+     * 流程类型
+     */
+    private String processDefinitionId;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/proofread/mapper/ProofreadIssuedMapper.java

@@ -0,0 +1,15 @@
+package com.jeeplus.test.proofread.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jeeplus.test.proofread.domain.ProofreadIssued;
+import org.apache.ibatis.annotations.Param;
+
+public interface ProofreadIssuedMapper extends BaseMapper<ProofreadIssued> {
+
+    ProofreadIssued findById(@Param("id")String id);
+
+    ProofreadIssued findProjectInfoById(@Param("id")String id);
+
+    void updateStatusById(@Param("id")String id, @Param("status")String status);
+
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/proofread/mapper/xml/ProofreadIssuedMapper.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.test.proofread.mapper.ProofreadIssuedMapper">
+
+	<select id="findById" resultType="com.jeeplus.test.proofread.domain.ProofreadIssued">
+		SELECT
+			a.id,
+			a.create_by,
+			a.create_date,
+			a.update_by,
+			a.update_date,
+			a.del_flag,
+			a.project_id,
+			b.`name` AS project_name,
+			b.assessment_date,
+			b.project_manager,
+			c.report_no,
+			d.`name` AS project_manager_name,
+			e.`name` AS department,
+			a.is_txtz,
+			a.is_bgdzdgd,
+			a.is_xyba,
+			a.is_wcba,
+			a.seal_type,
+			a.assessment_report,
+			a.assessment_explain,
+			a.assessment_detail,
+			a.consulting_report,
+			a.status,
+			a.agree_time,
+			a.proc_ins_id,
+			a.process_definition_id
+		FROM
+			proofread_issued a
+			LEFT JOIN program_project_list_info b ON a.project_id = b.id
+			LEFT JOIN program_report_no c ON b.id = c.program_id
+			LEFT JOIN sys_user d ON b.project_manager = d.id
+			LEFT JOIN sys_office e ON d.office_id = e.id
+		WHERE
+			a.del_flag = 0
+			AND a.project_id = #{id}
+	</select>
+
+	<select id="findProjectInfoById" resultType="com.jeeplus.test.proofread.domain.ProofreadIssued">
+		SELECT
+			b.id AS project_id,
+			b.`name` AS project_name,
+			b.assessment_date,
+			b.project_manager,
+			c.report_no,
+			d.`name` AS project_manager_name,
+			e.`name` AS department
+		FROM
+			program_project_list_info b
+			LEFT JOIN program_report_no c ON b.id = c.program_id
+			LEFT JOIN sys_user d ON b.project_manager = d.id
+			LEFT JOIN sys_office e ON d.office_id = e.id
+		WHERE
+			b.del_flag = 0
+			AND b.id = #{id}
+	</select>
+
+	<update id="updateStatusById">
+		update proofread_issued set status = #{status}
+		 <if test="status == '3'.toString">
+			 ,proc_ins_id = null
+			 ,process_definition_id = null
+		 </if>
+		 where del_flag = 0 AND id = #{id}
+	</update>
+
+</mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/proofread/service/ProofreadIssuedService.java

@@ -0,0 +1,67 @@
+package com.jeeplus.test.proofread.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.utils.UserUtils;
+import com.jeeplus.test.proofread.domain.ProofreadIssued;
+import com.jeeplus.test.proofread.mapper.ProofreadIssuedMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.UUID;
+
+@Service
+public class ProofreadIssuedService {
+
+    @Resource
+    private ProofreadIssuedMapper mapper;
+
+    public String save(ProofreadIssued issued){
+        ProofreadIssued byId = findById(issued.getProjectId());
+        if (byId != null) {
+            update(issued);
+            return byId.getId();
+        } else {
+            return add(issued);
+        }
+    }
+
+    public String add(ProofreadIssued issued) {
+        //获取当前登录人信息
+        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        String id = issued.getProjectId();
+        issued.setId(id);
+        issued.setCreateBy(userDTO.getId());
+        issued.setCreateDate(new Date());
+        issued.setUpdateBy(userDTO.getId());
+        issued.setUpdateDate(new Date());
+        issued.setDelFlag(0);
+        mapper.insert(issued);
+        return id;
+    }
+
+    public void update(ProofreadIssued issued) {
+        //获取当前登录人信息
+        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        issued.setUpdateBy(userDTO.getId());
+        issued.setUpdateDate(new Date());
+        LambdaQueryWrapper<ProofreadIssued> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ProofreadIssued::getProjectId, issued.getProjectId());
+        mapper.update(issued, wrapper);
+    }
+
+    public ProofreadIssued findById(String id) {
+        ProofreadIssued issued = mapper.findById(id);
+        return issued;
+    }
+
+    public ProofreadIssued findProjectInfoById(String id) {
+        ProofreadIssued issued = mapper.findProjectInfoById(id);
+        return issued;
+    }
+
+    public void updateStatusById(ProofreadIssued issued) {
+        mapper.updateStatusById(issued.getId(), issued.getStatus());
+    }
+}