fetch: 修改关闭未符合项接口数据格式

adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java

@@ -37,7 +37,7 @@ import java.util.Map;
 @Validated
 @Controller
 @RequestMapping(value = "/api")
-@Api(description = "登录接口")
+@Api(tags = "登录接口")
 @Slf4j
 public class LoginRestController {
 

adc-da-main/src/main/resources/application-dev.properties

@@ -3,7 +3,7 @@
 # 数据库配置
 #=============================================
 spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
+spring.datasource.url = jdbc:mysql://192.168.10.47:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
 spring.datasource.username = root
 spring.datasource.password = root
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/controller/SarStandIssueControlCauseController.java

@@ -40,7 +40,7 @@ import java.util.List;
 */
 @RestController
 @Api(tags = "|重点问题项管控模块-事业部|")
-@RequestMapping("/sarStandIssueControlCause/sar-stand-issue-control-cause")
+@RequestMapping("/api/sarStandIssueControlCause/sar-stand-issue-control-cause")
 public class SarStandIssueControlCauseController extends BaseController<SarStandIssueControlCause> {
 
     private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/entity/SarStandIssueControlCause.java

@@ -10,11 +10,13 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -44,21 +46,27 @@ public class SarStandIssueControlCause extends BaseEntity {
 
     @ExcelProperty(value = "创建时间",converter = TimestampConverter.class)
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("CREATE_TIME")
     private Timestamp createTime;
 
-    @ExcelProperty("关闭状态")
+    @ExcelIgnore
     @ApiModelProperty(value = "关闭状态（1为开启，2为关闭）")
     @TableField("CLOSE_STATE")
     private Integer closeState;
 
     @ExcelIgnore
     @ApiModelProperty(value = "实际关闭时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("ACTUAL_CLOSE_TIME")
     private Timestamp actualCloseTime;
 
     @ExcelProperty(value = "要求关闭时间",converter = TimestampConverter.class)
     @ApiModelProperty(value = "要求关闭时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("REQUIRE_CLOSE_TIME")
     private Timestamp requireCloseTime;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/service/impl/SarStandIssueControlCauseServiceImpl.java

@@ -44,7 +44,7 @@ public class SarStandIssueControlCauseServiceImpl extends ServiceImpl<SarStandIs
         //仅查询未关闭的
         sarStandIssueControlCauseQueryWrapper.eq("close_state",1);
         if(sarStandIssueControlCausePage.getStandId()!=null){
-            sarStandIssueControlCauseQueryWrapper.eq("stand_id",sarStandIssueControlCausePage.getStandId()).or().like("stand_name","%"+sarStandIssueControlCausePage.getStandName()+"%");
+            sarStandIssueControlCauseQueryWrapper.eq("stand_id",sarStandIssueControlCausePage.getStandId()).or().like("stand_name","%"+sarStandIssueControlCausePage.getStandId()+"%");
         }
         if(sarStandIssueControlCausePage.getProductName()!=null){
             sarStandIssueControlCauseQueryWrapper.like("product_name","%"+sarStandIssueControlCausePage.getProductName()+"%");
@@ -72,7 +72,7 @@ public class SarStandIssueControlCauseServiceImpl extends ServiceImpl<SarStandIs
         //仅查询关闭的
         sarStandIssueControlCauseQueryWrapper.eq("close_state",2);
         if(sarStandIssueControlCausePage.getStandId()!=null){
-            sarStandIssueControlCauseQueryWrapper.eq("stand_id",sarStandIssueControlCausePage.getStandId()).or().like("stand_name","%"+sarStandIssueControlCausePage.getStandName()+"%");
+            sarStandIssueControlCauseQueryWrapper.eq("stand_id",sarStandIssueControlCausePage.getStandId()).or().like("stand_name","%"+sarStandIssueControlCausePage.getStandId()+"%");
         }
         if(sarStandIssueControlCausePage.getProductName()!=null){
             sarStandIssueControlCauseQueryWrapper.like("product_name","%"+sarStandIssueControlCausePage.getProductName()+"%");

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/controller/SarStandIssueControlProductController.java

@@ -41,7 +41,7 @@ import java.util.List;
 */
 @RestController
 @Api(tags = "|重点问题项管控-产品规划部|")
-@RequestMapping("/sarStandIssueControlProduct/sar-stand-issue-control-product")
+@RequestMapping("/api/sarStandIssueControlProduct/sar-stand-issue-control-product")
 public class SarStandIssueControlProductController extends BaseController<SarStandIssueControlProduct> {
 
     private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/entity/SarStandIssueControlProduct.java

@@ -10,11 +10,13 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -44,6 +46,8 @@ public class SarStandIssueControlProduct extends BaseEntity {
 
     @ExcelProperty(value = "创建时间",converter = TimestampConverter.class)
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("CREATE_TIME")
     private Timestamp createTime;
 
@@ -54,11 +58,15 @@ public class SarStandIssueControlProduct extends BaseEntity {
 
     @ExcelIgnore
     @ApiModelProperty(value = "实际关闭时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("ACTUAL_CLOSE_TIME")
     private Timestamp actualCloseTime;
 
     @ExcelProperty(value = "要求关闭时间",converter = TimestampConverter.class)
     @ApiModelProperty(value = "要求关闭时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("REQUIRE_CLOSE_TIME")
     private Timestamp requireCloseTime;
 
@@ -94,6 +102,8 @@ public class SarStandIssueControlProduct extends BaseEntity {
 
     @ExcelProperty(value = "实施时间",converter = TimestampConverter.class)
     @ApiModelProperty(value = "实施时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("IMPLEMENT_TIME")
     private Timestamp implementTime;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/service/impl/SarStandIssueControlProductServiceImpl.java

@@ -42,7 +42,7 @@ public class SarStandIssueControlProductServiceImpl extends ServiceImpl<SarStand
         //仅查询未关闭的
         sarStandIssueControlProductQueryWrapper.eq("close_state",1);
         if(sarStandIssueControlProductPage.getStandId()!=null){
-            sarStandIssueControlProductQueryWrapper.eq("stand_id",sarStandIssueControlProductPage.getStandId()).or().like("stand_name","%"+sarStandIssueControlProductPage.getStandName()+"%");
+            sarStandIssueControlProductQueryWrapper.eq("stand_id",sarStandIssueControlProductPage.getStandId()).or().like("stand_name","%"+sarStandIssueControlProductPage.getStandId()+"%");
         }
         if(sarStandIssueControlProductPage.getResponsibleUnit()!=null){
             sarStandIssueControlProductQueryWrapper.eq("responsible_unit",sarStandIssueControlProductPage.getResponsibleUnit());
@@ -66,7 +66,7 @@ public class SarStandIssueControlProductServiceImpl extends ServiceImpl<SarStand
         //仅查询关闭的
         sarStandIssueControlProductQueryWrapper.eq("close_state",2);
         if(sarStandIssueControlProductPage.getStandId()!=null){
-            sarStandIssueControlProductQueryWrapper.eq("stand_id",sarStandIssueControlProductPage.getStandId()).or().like("stand_name","%"+sarStandIssueControlProductPage.getStandName()+"%");
+            sarStandIssueControlProductQueryWrapper.eq("stand_id",sarStandIssueControlProductPage.getStandId()).or().like("stand_name","%"+sarStandIssueControlProductPage.getStandId()+"%");
         }
         if(sarStandIssueControlProductPage.getResponsibleUnit()!=null){
             sarStandIssueControlProductQueryWrapper.eq("responsible_unit",sarStandIssueControlProductPage.getResponsibleUnit());

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java

@@ -47,7 +47,7 @@ import java.util.List;
 */
 @RestController
 @Api(tags = "未符合项整改")
-@RequestMapping("/sarStandUnqualified/sar-stand-unqualified")
+@RequestMapping("/api/sarStandUnqualified/sar-stand-unqualified")
 public class SarStandUnqualifiedController extends BaseController<SarStandUnqualified> {
 
     private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class);
@@ -86,7 +86,7 @@ public class SarStandUnqualifiedController extends BaseController<SarStandUnqual
      */
     @ApiOperation("批量关闭未符合项")
     @PostMapping("/close")
-    public ResponseMessage<List<String>> closeSarStandUnqualified(@RequestBody StandUnqualifiedListVO standUnqualifiedListVO){
+    public ResponseMessage<List<String>> closeSarStandUnqualified(StandUnqualifiedListVO standUnqualifiedListVO){
         if(standUnqualifiedListVO==null||standUnqualifiedListVO.getIds().size()==0){
             return Result.error(ResponseMessageCodeEnum.ERROR.getCode(),"未传入未符合项ID",null);
         }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java

@@ -10,11 +10,13 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -44,6 +46,8 @@ public class SarStandUnqualified extends BaseEntity {
 
     @ExcelProperty(value = "创建时间",converter = TimestampConverter.class)
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("CREATE_TIME")
     private Timestamp createTime;
 
@@ -54,11 +58,15 @@ public class SarStandUnqualified extends BaseEntity {
 
     @ExcelIgnore
     @ApiModelProperty(value = "实际关闭时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("ACTUAL_CLOSE_TIME")
     private Timestamp actualCloseTime;
 
     @ExcelProperty(value = "计划关闭时间",converter = TimestampConverter.class)
     @ApiModelProperty(value = "计划关闭时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("PLAN_CLOSE_TIME")
     private Timestamp planCloseTime;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java

@@ -44,7 +44,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
         //仅查询未关闭的
         sarStandUnqualifiedQueryWrapper.eq("close_state",1);
         if(sarStandUnqualifiedPage.getStandId()!=null){
-            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandName()+"%");
+            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
         }
         if(sarStandUnqualifiedPage.getProductName()!=null){
             sarStandUnqualifiedQueryWrapper.like("product_name","%"+sarStandUnqualifiedPage.getProductName()+"%");
@@ -71,7 +71,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
         //仅查询关闭的
         sarStandUnqualifiedQueryWrapper.eq("close_state",2);
         if(sarStandUnqualifiedPage.getStandId()!=null){
-            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandName()+"%");
+            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
         }
         if(sarStandUnqualifiedPage.getProductName()!=null){
             sarStandUnqualifiedQueryWrapper.like("product_name","%"+sarStandUnqualifiedPage.getProductName()+"%");