Ver código fonte

报销删除xml后汇总金额不变

huangguoce 2 meses atrás
pai
commit
bf570d04e4
15 arquivos alterados com 76 adições e 5 exclusões
  1. 1 1
      jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java
  2. 3 0
      jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/mapper/WorkContractInfoMapper.java
  3. 11 0
      jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/mapper/xml/WorkContractInfoMapper.xml
  4. 1 1
      jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/service/CcpmReimbursementInfoService.java
  5. 4 0
      jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalType/mapper/CcpmReimbursementTypeMapper.java
  6. 11 0
      jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalType/mapper/xml/CcpmReimbursementTypeMapper.xml
  7. 1 1
      jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/service/ZsReimbursementInfoService.java
  8. 3 0
      jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalType/mapper/ZsReimbursementTypeMapper.java
  9. 11 0
      jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalType/mapper/xml/ZsReimbursementTypeMapper.xml
  10. 1 1
      jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/service/ConsultancyReimbursementInfoService.java
  11. 3 0
      jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalType/mapper/ConsultancyReimbursementTypeMapper.java
  12. 11 0
      jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalType/mapper/xml/ConsultancyReimbursementTypeMapper.xml
  13. 2 0
      jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/ContractInfoMapper.java
  14. 12 0
      jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/xml/ContractInfoMapper.xml
  15. 1 1
      jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

+ 1 - 1
jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -749,7 +749,7 @@ public class ReimbursementInfoService {
         //保存信息
         for (ReimAmountAndFileDto dto : list) {
             //判断是否存在
-            Integer isExit = mapper.findIsExit(id, dto.getName());
+            Integer isExit = mapper.findByUrlIsExit(id, dto.getUrl());
             if (isExit == 0) {
                 if (com.jeeplus.utils.StringUtils.isNotBlank(dto.getUrl())){
                     WorkAttachmentInfo i = new WorkAttachmentInfo();

+ 3 - 0
jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/mapper/WorkContractInfoMapper.java

@@ -27,6 +27,9 @@ public interface WorkContractInfoMapper extends BaseMapper<WorkContractInfo> {
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
 
     @InterceptorIgnore(tenantLine = "true")
+    Integer findByUrlIsExit(@Param("id") String id, @Param("url")String url);
+
+    @InterceptorIgnore(tenantLine = "true")
     List<WorkAttachmentInfo> findList(@Param("id") String id);
 
     /**

+ 11 - 0
jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/mapper/xml/WorkContractInfoMapper.xml

@@ -105,6 +105,17 @@
 			AND attachment_name = #{name}
 	</select>
 
+	<select id="findByUrlIsExit" resultType="java.lang.Integer">
+		SELECT
+			COUNT( 0 )
+		FROM
+			work_attachment
+		WHERE
+			del_flag = 0
+		  AND attachment_id = #{id}
+		  AND url = #{url}
+	</select>
+
 	<select id="findList" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
 		SELECT * FROM work_attachment WHERE del_flag = 0 AND attachment_id = #{id}
 	</select>

+ 1 - 1
jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/service/CcpmReimbursementInfoService.java

@@ -722,7 +722,7 @@ public class CcpmReimbursementInfoService {
         //保存信息
         for (CcpmReimAmountAndFileDto dto : list) {
             //判断是否存在
-            Integer isExit = mapper.findIsExit(id, dto.getName());
+            Integer isExit = mapper.findByUrlIsExit(id, dto.getUrl());
             if (isExit == 0) {
                 if (StringUtils.isNotBlank(dto.getUrl())){
                     WorkAttachmentInfo i = new WorkAttachmentInfo();

+ 4 - 0
jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalType/mapper/CcpmReimbursementTypeMapper.java

@@ -48,4 +48,8 @@ public interface CcpmReimbursementTypeMapper extends BaseMapper<CcpmReimbursemen
     List<WorkAttachmentInfo> findListByIdAndAttachmentFlag(@Param("id") String id, @Param("attachmentFlag")String attachmentFlag);
     @InterceptorIgnore(tenantLine = "true")
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
+
+    @InterceptorIgnore(tenantLine = "true")
+    Integer findByUrlIsExit(@Param("id") String id, @Param("url")String url);
+
 }

+ 11 - 0
jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalType/mapper/xml/CcpmReimbursementTypeMapper.xml

@@ -52,4 +52,15 @@
 			AND attachment_id = #{id}
 			AND attachment_name = #{name}
 	</select>
+	<select id="findByUrlIsExit" resultType="java.lang.Integer">
+		SELECT
+			COUNT( 0 )
+		FROM
+			work_attachment
+		WHERE
+			del_flag = 0
+		  AND attachment_id = #{id}
+		  AND url = #{url}
+	</select>
+
 </mapper>

+ 1 - 1
jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/service/ZsReimbursementInfoService.java

@@ -759,7 +759,7 @@ public class ZsReimbursementInfoService {
         //保存信息
         for (ZsReimAmountAndFileDto dto : list) {
             //判断是否存在
-            Integer isExit = mapper.findIsExit(id, dto.getName());
+            Integer isExit = mapper.findByUrlIsExit(id, dto.getUrl());
             if (isExit == 0) {
                 if (com.jeeplus.utils.StringUtils.isNotBlank(dto.getUrl())){
                     WorkAttachmentInfo i = new WorkAttachmentInfo();

+ 3 - 0
jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalType/mapper/ZsReimbursementTypeMapper.java

@@ -48,4 +48,7 @@ public interface ZsReimbursementTypeMapper extends BaseMapper<ZsReimbursementTyp
     List<WorkAttachmentInfo> findListByIdAndAttachmentFlag(@Param("id") String id, @Param("attachmentFlag")String attachmentFlag);
     @InterceptorIgnore(tenantLine = "true")
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
+
+    @InterceptorIgnore(tenantLine = "true")
+    Integer findByUrlIsExit(@Param("id") String id, @Param("url")String url);
 }

+ 11 - 0
jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalType/mapper/xml/ZsReimbursementTypeMapper.xml

@@ -52,4 +52,15 @@
 			AND attachment_id = #{id}
 			AND attachment_name = #{name}
 	</select>
+	<select id="findByUrlIsExit" resultType="java.lang.Integer">
+		SELECT
+			COUNT( 0 )
+		FROM
+			work_attachment
+		WHERE
+			del_flag = 0
+		  AND attachment_id = #{id}
+		  AND url = #{url}
+	</select>
+
 </mapper>

+ 1 - 1
jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/service/ConsultancyReimbursementInfoService.java

@@ -726,7 +726,7 @@ public class ConsultancyReimbursementInfoService {
         //保存信息
         for (ConsultancyReimAmountAndFileDto dto : list) {
             //判断是否存在
-            Integer isExit = mapper.findIsExit(id, dto.getName());
+            Integer isExit = mapper.findByUrlIsExit(id, dto.getUrl());
             if (isExit == 0) {
                 if (com.jeeplus.utils.StringUtils.isNotBlank(dto.getUrl())){
                     WorkAttachmentInfo i = new WorkAttachmentInfo();

+ 3 - 0
jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalType/mapper/ConsultancyReimbursementTypeMapper.java

@@ -40,6 +40,9 @@ public interface ConsultancyReimbursementTypeMapper extends BaseMapper<Consultan
     List<WorkAttachmentInfo> findList(@Param("id") String id);
     @InterceptorIgnore(tenantLine = "true")
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
+
+    @InterceptorIgnore(tenantLine = "true")
+    Integer findByUrlIsExit(@Param("id") String id, @Param("url")String url);
     /**
      * 根据AttachmentFla 和AttachmentId 查询附件信息
      * @param id

+ 11 - 0
jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalType/mapper/xml/ConsultancyReimbursementTypeMapper.xml

@@ -52,4 +52,15 @@
 			AND attachment_id = #{id}
 			AND attachment_name = #{name}
 	</select>
+	<select id="findByUrlIsExit" resultType="java.lang.Integer">
+		SELECT
+			COUNT( 0 )
+		FROM
+			work_attachment
+		WHERE
+			del_flag = 0
+		  AND attachment_id = #{id}
+		  AND url = #{url}
+	</select>
+
 </mapper>

+ 2 - 0
jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/ContractInfoMapper.java

@@ -53,6 +53,8 @@ public interface ContractInfoMapper extends BaseMapper<ContractInfo> {
 
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
 
+    Integer findByUrlIsExit(@Param("id") String id, @Param("url")String url);
+
     /**
      * 修改合同实际金额
      * @param id

+ 12 - 0
jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/xml/ContractInfoMapper.xml

@@ -158,6 +158,18 @@
 			AND attachment_id = #{id}
 			AND attachment_name = #{name}
     </select>
+
+    <select id="findByUrlIsExit" resultType="java.lang.Integer">
+        SELECT
+            COUNT( 0 )
+        FROM
+            work_attachment
+        WHERE
+            del_flag = 0
+          AND attachment_id = #{id}
+          AND url = #{url}
+    </select>
+
     <select id="findDtos" resultType="com.jeeplus.sys.domain.WorkAttachmentInfo">
         SELECT
 			id,

+ 1 - 1
jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -967,7 +967,7 @@ public class CwReimbursementInfoService {
         //保存信息
         for (CwReimAmountAndFileDto dto : list) {
             //判断是否存在
-            Integer isExit = mapper.findIsExit(id, dto.getName());
+            Integer isExit = mapper.findByUrlIsExit(id, dto.getUrl());
             if (isExit == 0) {
                 if (com.jeeplus.utils.StringUtils.isNotBlank(dto.getUrl())){
                     WorkAttachmentInfo i = new WorkAttachmentInfo();