Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/controller/CwProjectReportSignatureCallBackController.java

@@ -272,6 +272,9 @@ public class CwProjectReportSignatureCallBackController {
                 }
             }
 
+            //将报告数据中的盖章状态更改为已盖章
+            cwProjectReportService.updateReportSealType(projectReportData);
+
         }catch (Exception e){
             e.printStackTrace();
         }finally {

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

@@ -66,4 +66,10 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      * @return
      */
     CwProjectReportData queryByContractId(@Param("contractId") String contractId);
+
+    /**
+     * 修改盖章状态
+     * @param cwProjectReportData
+     */
+    void updateReportSealType(CwProjectReportData cwProjectReportData);
 }

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

@@ -150,6 +150,13 @@
         signature_url = #{signatureUrl}
         where id = #{id}
     </update>
+
+    <update id="updateReportSealType">
+        update cw_project_report_new_line set
+        seal_type = '已盖章'
+        where report_id = #{id}
+    </update>
+
     <update id="updateDelFlag">
         UPDATE cw_project_report SET del_flag = #{flag} where id = #{id}
     </update>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportService.java

@@ -347,6 +347,14 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
     }
 
     /**
+     * 修改盖章状态
+     * @param projectReportData
+     */
+    public void updateReportSealType(CwProjectReportData projectReportData){
+        reportMapper.updateReportSealType(projectReportData);
+    }
+
+    /**
      * 新增
      */
     @Transactional(rollbackFor = Exception.class)

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/service/ReportCancellApplyService.java

@@ -243,16 +243,16 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
         String idArray[] =ids.split(",");
         //删除前先将报告文号给复原
         ArrayList<String> strings = Lists.newArrayList(idArray);
-        for (int i=0;i<strings.size();i++){
-            //修改新建行的del_flag为0，delete_sign为0
-            ReportCancellApply cancellApply = applyMapper.selectById(strings.get(i));
-            CwProjectInfoData infoData = infoMapper.getById(cancellApply.getReportNewLineId());
-            infoData.setDelFlag(0);
-            infoData.setDeleteSign("0");
-            infoMapper.updateById(infoData);
-            ReportInfoDto reportInfoDto = applyMapper.queryById(strings.get(i));
-            cancelMapper.deleteByReportNo(reportInfoDto.getReportNo());
-        }
+//        for (int i=0;i<strings.size();i++){
+//            //修改新建行的del_flag为0，delete_sign为0
+//            ReportCancellApply cancellApply = applyMapper.selectById(strings.get(i));
+//            CwProjectInfoData infoData = infoMapper.getById(cancellApply.getReportNewLineId());
+//            infoData.setDelFlag(0);
+//            infoData.setDeleteSign("0");
+//            infoMapper.updateById(infoData);
+//            ReportInfoDto reportInfoDto = applyMapper.queryById(strings.get(i));
+//            cancelMapper.deleteByReportNo(reportInfoDto.getReportNo());
+//        }
         //将报告文号报废表的对应的报告文号给删除
 
         this.removeByIds (Lists.newArrayList (idArray));