项目清单加字段 ！ 白名单添加一个导出

adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java

@@ -85,6 +85,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
     //调研流程下载接口
     addInterceptor.excludePathPatterns("/api/att/attFile/downloadFile");
 
+    addInterceptor.excludePathPatterns("/api/lawss/activiti/exportProcessDetailInfo");
+
 
 //    //测试接口使用
 //    addInterceptor.excludePathPatterns("/api/**");

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java

@@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
 import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
@@ -54,7 +55,7 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
 
 
     @ApiOperation(value = "获取是否存在重复名企标名称接口")
-    @GetMapping("getDataByName")
+    @GetMapping("/getDataByName")
     public ResponseMessage<Object> getDataByName(EsRevisePlan esRevisePlan){
         return Result.success(iEsRevisePlanService.getDataByName(esRevisePlan));
     }
@@ -65,18 +66,36 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
         return Result.success(iEsRevisePlanService.modPlan(esRevisePlan));
     }
 
+    @ApiOperation(value = "编辑企标计划")
+    @PostMapping("/modPlanByWk")
+    public ResponseMessage<Object> modPlanByWk(@RequestBody EsRevisePlan esRevisePlan){
+        return Result.success(iEsRevisePlanService.modPlan(esRevisePlan));
+    }
+
     @ApiOperation(value = "添加企标计划")
     @PostMapping("addPlan")
     public ResponseMessage<Object> addPlan(EsRevisePlan esRevisePlan){
         return Result.success(iEsRevisePlanService.addPlan(esRevisePlan));
     }
 
+    @ApiOperation(value = "添加企标计划")
+    @PostMapping("/addPlanByWk")
+    public ResponseMessage<Object> addPlanByWk(@RequestBody EsRevisePlan esRevisePlan){
+        return Result.success(iEsRevisePlanService.addPlan(esRevisePlan));
+    }
+
     @ApiOperation(value = "删除单个企标计划")
     @GetMapping("delPlan")
     public ResponseMessage<Object> delPlan(String id){
         return Result.success(iEsRevisePlanService.delPlan(id));
     }
 
+    @ApiOperation(value = "删除单个企标计划")
+    @GetMapping("delPlanByWk")
+    public ResponseMessage<Object> delPlanByWk(@RequestParam("id") String id){
+        return Result.success(iEsRevisePlanService.delPlans(id));
+    }
+
     @ApiOperation(value = "批量删除企标计划")
     @GetMapping("delPlans")
     public ResponseMessage<Object> delPlans(String ids){

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java

@@ -61,4 +61,6 @@ public class StandAttrInfoDto {
     private String CYCVPPSCN;
 
     private Long unCount;
+
+    private String endTimes;
 }

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

@@ -379,7 +379,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
 
         QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
         wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","STAND_TYPE","(select count(*) from sar_stand_unqualified" +
-                " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ");
+                " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ",
+                "(select GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME )  from sar_stand_unqualified where " +
+                " STAND_ID = r.stand_id and CLOSE_STATE = '1' AND PLAN_CLOSE_TIME is NOT NULL ) as endTimes ");
         wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'");
         Page<SarStandardsInfo> page1 = new Page<>(current, pageSize);
         IPage<SarStandardsInfo> userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1);
@@ -407,6 +409,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             p.setStandType(s.getStandType());
             p.setStandEnName(s.getStandEnName());
             p.setUnCount(s.getUnCount());
+            p.setEndTimes(s.getEndTimes());
             for (SarStandAttrInfo a:list2){
                 if(s.getId().equals(a.getStandId())){
                     p.setCYCVPPSBM(a.getCycvppsbm());

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java

@@ -146,6 +146,10 @@ public class SarStandardsInfo extends BaseEntity {
     @TableField(exist = false)
     private Long unCount;
 
+    @ApiModelProperty(value = "整改完成时间")
+    @TableField(exist = false)
+    private String endTimes;
+
 
     // 以下为非表中字段
     @TableField(exist = false)