财务-报告作废归档修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/domain/CwProjectReport.java

@@ -220,4 +220,16 @@ public class CwProjectReport extends BaseEntity {
      *是否数据证券业务
      */
     private String securityBusiness;
+
+    /**
+     * 签字注师1名称
+     */
+    @TableField(exist = false)
+    private String signatureAnnotator1Name;
+
+    /**
+     * 签字注师2名称
+     */
+    @TableField(exist = false)
+    private String signatureAnnotator2Name;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -456,9 +456,12 @@
 			AND attachment_id = #{id}
     </select>
     <select id="getByNewLineId" resultType="com.jeeplus.test.cw.projectReport.domain.CwProjectReport">
-        select * from cw_project_report where id = #{reportId}
+        select a.*,sys1.name as signatureAnnotator1Name,sys2.name as signatureAnnotator2Name from cw_project_report a
+        left join sys_user sys1 on a.signature_annotator1 = sys1.id
+        left join sys_user sys2 on a.signature_annotator2 = sys2.id
+        where a.id = #{reportId}
     </select>
-    
+
     <select id="getServedUnitName" resultType="java.lang.String">
         select b.name from cw_project_records cw_pro
         left join cw_work_contract_info a on cw_pro.contract_id = a.id

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApplyArchived/mapper/xml/ReportCancellApplyArchivedMapper.xml

@@ -61,7 +61,7 @@
         a.del_flag,
         a.remarks,
         a.status,
-        a.apply_file_type,
+        ifnull(a.apply_file_type,'0') as apply_file_type,
 				a.proc_ins_id,
         a.process_definition_id,
 				c.document_no,

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApplyArchived/service/ReportCancellApplyArchivedService.java

@@ -150,8 +150,8 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
             reportDTO.setReportNo(byId.getReportNo());
             reportDTO.setReportDate(byId.getReportDate());
             reportDTO.setReportCreateName(byId.getCreateBy());
-            reportDTO.setSignatureAnnotator1Name(report.getSignatureAnnotator1());
-            reportDTO.setSignatureAnnotator2Name(report.getSignatureAnnotator2());
+            reportDTO.setSignatureAnnotator1Name(report.getSignatureAnnotator1Name());
+            reportDTO.setSignatureAnnotator2Name(report.getSignatureAnnotator2Name());
         } else {
             //传来的是归档的id
             apply = cancellApplyMapper.selectByArchivedId(id);
@@ -191,8 +191,8 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
                 reportDTO.setReportNo(byId.getReportNo());
                 reportDTO.setReportDate(byId.getReportDate());
                 reportDTO.setReportCreateName(byId.getCreateBy());
-                reportDTO.setSignatureAnnotator1Name(report.getSignatureAnnotator1());
-                reportDTO.setSignatureAnnotator2Name(report.getSignatureAnnotator2());
+                reportDTO.setSignatureAnnotator1Name(report.getSignatureAnnotator1Name());
+                reportDTO.setSignatureAnnotator2Name(report.getSignatureAnnotator2Name());
             }
         }
         return reportDTO;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/service/WareHouseBasicService.java

@@ -141,6 +141,7 @@ public class WareHouseBasicService {
         //根据经办人id查出经办人的名称
         String name = basicMapper.getUserNameByUserId(info.getHandledBy());
         dto.setHandledBy(name);
+        dto.setHandledById(info.getHandledBy());
         dto.setFiles(files);
         return dto;
     }
@@ -161,6 +162,7 @@ public class WareHouseBasicService {
         BeanUtils.copyProperties(dto, info);
         info.setUpdateBy(userDTO.getId());
         info.setUpdateDate(new Date());
+        info.setHandledBy(dto.getHandledById());
         basicMapper.updateById(info);
         // 修改报销详情列表信息
         // 删除原有数据