批量归档

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/controller/CwFillingbatchController.java

@@ -148,6 +148,7 @@ public class CwFillingbatchController {
     /**
      * 导入批量归档数据
      *
+     *
      * @return
      */
     @DemoMode

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwFillingBatchInfoMapper.java

@@ -18,6 +18,7 @@ import java.util.List;
 @Mapper
 public interface CwFillingBatchInfoMapper extends BaseMapper<CwFillingbatchInfo> {
 
+
     IPage<CwFillingbatchInfoDTO> findList(Page<CwFillingbatchInfoDTO> page,@Param(Constants.WRAPPER) QueryWrapper<CwFillingbatchInfoDTO> queryWrapper);
 
     List<CwFillingbatchInfoDTO> findProjectList();

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwFillingbatchFileMapper.java

@@ -6,4 +6,5 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface CwFillingbatchFileMapper extends BaseMapper<CwFillingbatchFile> {
+
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwFillingbatchProjectMapper.java

@@ -6,4 +6,5 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface CwFillingbatchProjectMapper extends BaseMapper<CwFillingbatchProject> {
+
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwProjectRecordsMapper.java

@@ -118,4 +118,5 @@ public interface CwProjectRecordsMapper extends BaseMapper<CwProjectRecords> {
     List<CwProjectPlanDetails> getPlanDetails();
 
     CwProjectRecordsDTO getInfoById(@Param("id") String id);
+
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/xml/CwFillingbatchInfoMapper.xml

@@ -116,7 +116,7 @@
         left join sys_user su on a.project_leader_id = su.id and su.del_flag = '0'
         left join sys_user su1 on a.create_by_id = su1.id and su1.del_flag = '0'
         ${ew.customSqlSegment}
-        and a.project_level= '2' and a.del_flag = '0' and pr.id not in (select report_id from cw_fillingbatch_project where status in (2,3,5) and del_flag = '0')order by a.create_time DESC
+        and a.project_level = '2' and a.del_flag = '0' and pr.id not in (select report_id from cw_fillingbatch_project where status in (2,3,5) and del_flag = '0')order by a.create_time DESC
     </select>
 
     <select id="getIdList" resultType="string">

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/CwFillingbatchService.java

@@ -370,6 +370,7 @@ public class CwFillingbatchService {
                     return "导入项目报告号类型不一样";
                 }
             }
+
             ArrayList<CwFillingbatchFile> files = new ArrayList<>();
             if (ObjectUtil.isEmpty(cwFillingbatchInfoDTO)){
                 continue;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/dto/CwFillingbatchInfoDTO.java

@@ -89,4 +89,5 @@ public class CwFillingbatchInfoDTO extends BaseEntity {
     private String parentId;
 
 
+
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/dto/CwFillingbatchProjectDTO.java

@@ -31,6 +31,7 @@ public class CwFillingbatchProjectDTO extends BaseEntity {
     private String no;
     @Excel(name = "*报告号（必填）",width = 25,orderNum = "1")
     private String reportNo;
+
     //项目名称
     @Excel(name = "文件内容",width = 25,orderNum = "3")
     private String name;

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

@@ -226,6 +226,7 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      * 数据导入(临时)
      * @param reportNoList
      * @return
+     *
      */
     @InterceptorIgnore(tenantLine = "true")
     List<CwProjectReport> getReportInfoByNoList(@Param("reportNoList") List<String> reportNoList);

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

@@ -1057,6 +1057,7 @@
         update cw_project_report set signature_annotator1=#{signatureAnnotator1},signature_annotator2=#{signatureAnnotator2},signature_annotator_status=#{signatureAnnotatorStatus} where id=#{id}
     </update>
 
+
     <select id="getIdByNo" resultType="string">
         select report_id from cw_project_report_new_line where report_no = #{reportNo}
     </select>