Merge remote-tracking branch 'origin/develop_master' into develop_1

adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java

@@ -143,8 +143,8 @@ public class ScheduledJob {
 
 
 
-//    @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
-    @Scheduled(cron="*/5 * * * * ?")
+    @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
+//    @Scheduled(cron="*/5 * * * * ?")
     @Async
     public void TextStatusSchedulingTasks() {
         QueryWrapper<SarStandardsInfo> wrapper = new QueryWrapper<>();

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java

@@ -50,6 +50,15 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
         return Result.success("200",map);
     }
 
+    @GetMapping("/queryProjectConfirm")
+    @ApiOperation("车型/项目库-清单标准确认流程用")
+    public ResponseMessage queryMaintenanceProjectConfirm(@RequestParam(defaultValue = "1", value = "Page")int Page, @RequestParam(defaultValue = "10", value = "PageSize") int PageSize,SarStandProjectLibraryDto sarDto) {
+        IPage<SarStandProjectLibrary> MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProjectConfirm(Page,PageSize,sarDto);
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("total",MaintenanceList);
+        return Result.success("200",map);
+    }
+
     @GetMapping("/queryProjectWorkFlow")
     @ApiOperation("车型/项目库-！！！")
     public ResponseMessage queryMaintenanceProjectWorkFlow(@RequestParam(defaultValue = "1", value = "Page")int Page, @RequestParam(defaultValue = "10", value = "PageSize") int PageSize,SarStandProjectLibraryDto sarDto) {

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java

@@ -26,4 +26,5 @@ public interface SarStandProjectLibraryDao extends BaseMapper<SarStandProjectLib
         Integer selectCountWorkFlow(@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag);
         List<String> getAllStands();
         List<String> getAllStand();
+        void deleteByProjectId(@Param("projectId")String projectId);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java

@@ -9,6 +9,7 @@ import java.util.List;
 public interface SarStandProjectLibraryService {
     IPage<SarStandProjectLibrary> queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto);
     IPage<SarStandProjectLibrary> queryMaintenanceProjectWorkFlow(int current, int pageSize, SarStandProjectLibraryDto sarDto);
+    IPage<SarStandProjectLibrary> queryMaintenanceProjectConfirm(int current, int pageSize, SarStandProjectLibraryDto sarDto);
     IPage<SarStandProjectLibrary> queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto);
     List<SarStandProjectLibrary> queryById(String id);
     IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java

@@ -98,6 +98,36 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         int flag=3;
         return getSarStandProjectLibraryIPage(current, pageSize, sar,flag);
     }
+
+    @Override
+    public IPage<SarStandProjectLibrary> queryMaintenanceProjectConfirm(int current, int pageSize,
+                                                                 SarStandProjectLibraryDto sarDto) {
+        SarStandProjectLibrary sar = new SarStandProjectLibrary();
+        sar.setProjectPlatfor(sarDto.getProjectPlatfor());
+        sar.setProjectNumber(sarDto.getProjectNumber());
+        sar.setProjectName(sarDto.getProjectName());
+        sar.setProjectClassification(sarDto.getProjectClassification());
+        sar.setProjectStatus(sarDto.getProjectStatus());
+        sar.setProjectGroup(sarDto.getProjectGroup());
+        sar.setCurrentNode(sarDto.getCurrentNode());
+        sar.setProjectLevel(sarDto.getProjectLevel());
+        sar.setProjectManager(sarDto.getProjectManager());
+        sar.setProductLine(sarDto.getProductLine());
+        SimpleDateFormat formater = new SimpleDateFormat();
+        formater.applyPattern("yyyy-MM-dd");
+        try {
+            if (sarDto.getProjectStartDate()!=null){
+                sar.setProjectStartDate(formater.parse(sarDto.getProjectStartDate()));
+            }
+            if (sarDto.getProjectEndDate()!=null){
+                sar.setProjectEndDate(formater.parse(sarDto.getProjectEndDate()));
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        int flag=4;
+        return getSarStandProjectLibraryIPage(current, pageSize, sar,flag);
+    }
     @Override
     public IPage<SarStandProjectLibrary> queryNotMaintenanceProject(int current, int pageSize,
                                                                     SarStandProjectLibraryDto sarDto) {
@@ -240,6 +270,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
 
     @Override
     public void batchInsert(List<StandProjectRelationDto> list) {
+        sarStandProjectLibraryDao.deleteByProjectId(list.get(0).getProjectId());
         sarStandProjectLibraryDao.batchInsert(list);
     }
 
@@ -323,7 +354,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             userIPage.setRecords(sarStandProjectLibraries);
             userIPage.setTotal(count);
             return userIPage;
-        }else {
+        }
+        else {
             flag=2;
             List<SarStandProjectLibrary> sarStandProjectLibraries = sarStandProjectLibraryDao.selectPagesWorkFlow(current, pageSize, wrapper, flag);
             Integer count = sarStandProjectLibraryDao.selectCountWorkFlow(wrapper, flag);