修改签字注师流程

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/controller/CwProjectReportController.java

@@ -16,6 +16,7 @@ import com.jeeplus.finance.invoice.util.SignaturePostUtil;
 import com.jeeplus.finance.projectReport.domain.CwProjectReport;
 import com.jeeplus.finance.projectReport.domain.CwProjectReportData;
 import com.jeeplus.finance.projectReport.domain.CwProjectReportSignature;
+import com.jeeplus.finance.projectReport.domain.CwSignatureAnnotator;
 import com.jeeplus.finance.projectReport.mapper.ProjectReportWorkAttachmentMapper;
 import com.jeeplus.finance.projectReport.service.CwProjectReportService;
 import com.jeeplus.finance.projectReport.service.dto.CwProjectReportDTO;
@@ -74,6 +75,7 @@ public class CwProjectReportController {
     @Autowired
     private IFlowableApi flowTaskService;
 
+
     /**
      * 保存财务报告信息-流程
      * @param reportData
@@ -595,4 +597,30 @@ public class CwProjectReportController {
         return ResponseEntity.ok(arrayList);
     }
 
+
+    /**
+     * 发起修改签字注师流程
+     */
+    @ApiOperation(value = "发起修改签字注师流程")
+    @PostMapping(value = "saveSignatureAnnotator")
+    public ResponseEntity saveSignatureAnnotator(@Valid @RequestBody CwProjectReportData reportData) throws Exception {
+        String id = projectReportService.saveSignatureAnnotator(reportData);
+        return ResponseUtil.newInstance().add("businessTable", "cw_project_report").add("businessId", id).ok ("操作成功");
+    }
+
+
+
+    /**
+     * 查找修改签字注师历史记录
+     */
+    @ApiOperation(value = "查找修改签字注师记录")
+    @GetMapping("getSignatureAnnotatorList")
+    public ResponseEntity<List<CwSignatureAnnotator>> getSignatureAnnotatorList(String reportId){
+        List<CwSignatureAnnotator> cwSignatureAnnotators=projectReportService.getSignatureAnnotatorList(reportId);
+        return ResponseEntity.ok(cwSignatureAnnotators);
+    }
+
+
+
+
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectReport.java

@@ -228,12 +228,14 @@ public class CwProjectReport extends BaseEntity {
      * 签字注师1名称
      */
     @TableField(exist = false)
+    @Excel(name = "签字注册会计师1",width = 25)
     private String signatureAnnotator1Name;
 
     /**
      * 签字注师2名称
      */
     @TableField(exist = false)
+    @Excel(name = "签字注册会计师2",width = 25)
     private String signatureAnnotator2Name;
 
     /**
@@ -245,4 +247,12 @@ public class CwProjectReport extends BaseEntity {
      * 业务对象
      */
     private String businessObjects;
+
+
+    /**
+     * 签字注师状态
+     */
+
+    private String signatureAnnotatorStatus;
+
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectReportData.java

@@ -488,4 +488,10 @@ public class CwProjectReportData extends BaseDTO {
      * 合同名称
      */
     private String contractName;
+
+    /**
+     * 签字注师审核状态
+     */
+
+    private String signatureAnnotatorStatus;
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/CwProjectReportSignatureMapper.java

@@ -3,8 +3,11 @@ package com.jeeplus.finance.projectReport.mapper;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.projectReport.domain.CwProjectReportSignature;
+import com.jeeplus.finance.projectReport.domain.CwSignatureAnnotator;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * @Entity com.jeeplus.test.cw.projectReport.domain.CwProjectReportSignature
  */
@@ -16,6 +19,7 @@ public interface CwProjectReportSignatureMapper extends BaseMapper<CwProjectRepo
     @InterceptorIgnore(tenantLine = "true")
     void updateInfoById(CwProjectReportSignature info);
 
+    List<CwSignatureAnnotator> getSignatureAnnotatorList(String reportId);
 }
 
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -58,6 +58,7 @@
         a.real_create,
         a.proc_ins_id,
         a.process_definition_id,
+        a.signature_annotator_status,
         b.project_number as projectNumber,
         b.project_name as projectName,
         b.project_master_id as projectMasterId,
@@ -136,6 +137,7 @@
         a.signature_contract_id,
         a.proc_ins_id,
         a.process_definition_id,
+        a.signature_annotator_status,
         b.project_number as projectNumber,
         b.project_name as projectName,
         c.name as departmentName,
@@ -781,4 +783,47 @@
         </where>
 
     </select>
+
+    <select id="getReportByReportNo" resultType="com.jeeplus.finance.projectReport.domain.CwProjectReport">
+        select
+            cpr.*
+        from
+            cw_project_report cpr
+        left join
+            cw_project_report_new_line cw_prnl on cpr.id=cw_prnl.report_id
+        where
+            cw_prnl.report_no=#{reportNo}
+    </select>
+
+    <select id="getReportInfoByNoList" resultType="com.jeeplus.finance.projectReport.domain.CwProjectReport">
+        select
+            cpr.*,cw_prnl.report_no as "reportNo"
+        from
+            cw_project_report cpr
+        left join
+            cw_project_report_new_line cw_prnl on cpr.id=cw_prnl.report_id
+        <where>
+            <if test="reportNoList != null">
+                AND cw_prnl.report_no IN
+                <foreach collection="reportNoList" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
+    </select>
+
+    <select id="getReportByReportNo" resultType="com.jeeplus.finance.projectReport.domain.CwProjectReport">
+        select
+            cpr.*
+        from
+            cw_project_report cpr
+        left join
+            cw_project_report_new_line cw_prnl on cpr.id=cw_prnl.report_id
+        where
+            cw_prnl.report_no=#{reportNo}
+    </select>
+
+
+
 </mapper>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportSignatureMapper.xml

@@ -78,4 +78,25 @@
         WHERE id = #{id}
             AND del_flag = 0
     </update>
+
+    <select id="getSignatureAnnotatorList" resultType="com.jeeplus.finance.projectReport.domain.CwSignatureAnnotator">
+        select
+            sa.id,
+            (SELECT DISTINCT su.login_name  from cw_project_report_signature_annotator sa
+            LEFT JOIN sys_user su on sa.signature_annotator1=su.id
+            where sa.signature_annotator1= sa.signature_annotator1 and sa.report_id=#{reportId}) as signatureAnnotator1,
+            (SELECT DISTINCT su.login_name  from cw_project_report_signature_annotator sa
+            LEFT JOIN sys_user su on sa.signature_annotator2=su.id
+            where sa.signature_annotator2= sa.signature_annotator2 and sa.report_id=#{reportId}) as signatureAnnotator2,
+            (SELECT DISTINCT su.login_name  from cw_project_report_signature_annotator sa
+            LEFT JOIN sys_user su on sa.create_by_id=su.id
+            where sa.create_by_id= sa.create_by_id and sa.report_id=#{reportId} and sa.create_by_id=(SELECT create_by_id from cw_project_report where id=#{reportId})) as userName,
+            sa.create_time
+        from
+            cw_project_report_signature_annotator sa
+        LEFT JOIN sys_user su on sa.create_by_id=su.id
+        where sa.create_by_id=(SELECT create_by_id from cw_project_report where id=#{reportId}) and sa.report_id=#{reportId}
+    </select>
+
+
 </mapper>