报销bug修复，报告和项目提示开票限制

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/xml/ReimbursementInfoMapper.xml

@@ -389,6 +389,8 @@
 		a.number_count,
 		a.subsidy,
 		a.days,
+		a.reimbursement_type,
+		a.unique_id,
 		a.content,
 		su.name as user_name,
 		so.name as dept_name,
@@ -495,6 +497,8 @@
 		a.number_count,
 		a.subsidy,
 		a.days,
+		a.reimbursement_type,
+		a.unique_id,
 		a.content,
 		su.name as user_name,
 		so.name as dept_name,

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/mapper/xml/CcpmReimbursementInfoMapper.xml

@@ -593,6 +593,8 @@
 		a.number_count,
         a.subsidy,
 		a.days,
+		a.reimbursement_type,
+		a.unique_id,
 		a.content,
 		su.name as user_name,
 		so.name as dept_name,
@@ -626,6 +628,8 @@
 		a.number_count,
         a.subsidy,
 		a.days,
+		a.reimbursement_type,
+		a.unique_id,
 		a.content,
 		su.name as user_name,
 		so.name as dept_name,
@@ -693,6 +697,8 @@
 		a.number_count,
         a.subsidy,
 		a.days,
+		a.reimbursement_type,
+		a.unique_id,
 		a.content,
 		su.name as user_name,
 		so.name as dept_name,

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/mapper/xml/ZsReimbursementInfoMapper.xml

@@ -614,7 +614,10 @@
 		a.number_count,
 		a.subsidy,
 		a.days,
+		a.reimbursement_type,
+		a.unique_id,
 		a.content,
+		a.project_name as project_name,
 		su.name as user_name,
 		so.name as dept_name,
 		zs_type.name as type_name,

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/reportArchieve/mapper/ZsReportArchieveMapper.java

@@ -46,4 +46,11 @@ public interface ZsReportArchieveMapper extends BaseMapper<ZsReportArchieve> {
      * @param zsReportArchieve
      */
     Integer updatePlaceByYear(ZsReportArchieve zsReportArchieve);
+
+    /**
+     * 逻辑删除，同时更新update_time和update_by
+     * @param id 主键
+     * @param updateById 更新人
+     */
+    void logicalDeleteById(@Param("id") String id, @Param("updateById") String updateById);
 }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/reportArchieve/mapper/xml/ZsReportArchieveMapper.xml

@@ -209,4 +209,12 @@
           AND a.status = '1'
           AND a.del_flag = '0';
     </update>
+
+    <update id="logicalDeleteById">
+        UPDATE zs_report_archieve
+        SET del_flag = '1',
+            update_time = NOW(),
+            update_by_id = #{updateById}
+        WHERE id = #{id} AND del_flag = '0'
+    </update>
 </mapper>

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/reportArchieve/service/ZsReportArchieveService.java

@@ -418,12 +418,14 @@ public class ZsReportArchieveService {
     }
 
     /**
-     * 删除
+     * 逻辑删除
      * @param id
      * @return
      */
     public String remove(String id) {
-        reportArchieveMapper.deleteById(id);
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        String updateById = userDTO != null ? userDTO.getId() : null;
+        reportArchieveMapper.logicalDeleteById(id, updateById);
         return "删除成功";
     }
 

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/mapper/xml/ConsultancyReimbursementInfoMapper.xml

@@ -563,6 +563,8 @@
 		a.number_count,
 		a.subsidy,
 		a.days,
+		a.reimbursement_type,
+		a.unique_id,
 		a.content,
 		su.name as user_name,
 		so.name as dept_name,
@@ -596,6 +598,8 @@
 		a.number_count,
 		a.subsidy,
 		a.days,
+		a.reimbursement_type,
+		a.unique_id,
 		a.content,
 		su.name as user_name,
 		so.name as dept_name,
@@ -663,6 +667,8 @@
 		a.number_count,
 		a.subsidy,
 		a.days,
+		a.reimbursement_type,
+		a.unique_id,
 		a.content,
 		su.name as user_name,
 		so.name as dept_name,

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/xml/CwReimbursementInfoMapper.xml

@@ -622,8 +622,6 @@
 		a.content,
 		a.unique_id,
 		a.reimbursement_type,
-		a.unique_id,
-		a.reimbursement_type,
 		su.name as user_name,
 		so.name as dept_name,
 		cw_type.name as type_name,
@@ -732,6 +730,8 @@
 		a.number_count,
 		a.subsidy,
 		a.days,
+		a.reimbursement_type,
+		a.unique_id,
 		a.content,
 		su.name as user_name,
 		so.name as dept_name,