diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index e098b0b8..26d1d7d5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -227,72 +227,13 @@ public class SarStandProjectLibraryController extends BaseController queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("project_number",sarStandProjectLibrary.getProjectNumber()); - - sarStandProjectLibraryService.saveOrUpdate(sarStandProjectLibrary,queryWrapper); - - } -// }catch (Exception e){ -// head.setERRORCODE("2"); -// head.setRESULT("业务失败需要重做"); -// return responseDto(head); -// } - head.setERRORCODE("0"); - head.setRESULT("成功"); - responseDto.setHEAD(head); + Head head = sarStandProjectLibraryService.AnalysisJsonAndStorage(jsonStr); + ArrayList companies = new ArrayList<>(); + ResponseDto responseDto = new ResponseDto(head,companies); + Company company = new Company(); + company.setCOMPANY_CODE(""); + company.setFISCAL_YEAR(""); + companies.add(company); return responseDto; } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/Company.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/Company.java new file mode 100644 index 00000000..05e5c48a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/Company.java @@ -0,0 +1,10 @@ +package com.adc.da.slrs.sarStandProjectLibrary.entity; + +import lombok.Data; + +@Data +public class Company { + private String COMPANY_CODE; + + private String FISCAL_YEAR; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/ResponseDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/ResponseDto.java index d8a99c92..074c12db 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/ResponseDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/ResponseDto.java @@ -17,8 +17,11 @@ public class ResponseDto { // } - public ResponseDto(Head head) { - this.HEAD = head; + List LIST; + + public ResponseDto(Head HEAD, List LIST) { + this.HEAD = HEAD; + this.LIST = LIST; } public ResponseDto() { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java index ac2a411e..06c6a716 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java @@ -5,15 +5,17 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +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; /** *

- * + * *

* * @author ZhangJin @@ -49,10 +51,14 @@ public class SarStandProjectLibrary extends BaseEntity { @ApiModelProperty(value = "项目群") private String projectGroup; + @ApiModelProperty(value = "项目开始日期") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date projectStartDate; + @ApiModelProperty(value = "项目完成日期") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date projectEndDate; @ApiModelProperty(value = "当前节点") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index aaf079e1..d0dc5452 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -19,5 +19,6 @@ public interface SarStandProjectLibraryService { void deleteByIds(List ids); void batchInsert(@Param("ids") List list); List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId); + public Head AnalysisJsonAndStorage(String jsonStr); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index ed2f5dd3..09d94452 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -1,4 +1,5 @@ package com.adc.da.slrs.sarStandProjectLibrary.service.impl; +import com.adc.da.ocr.util.UUIDUtils; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo; import com.adc.da.slrs.sarStandProjectLibrary.entity.*; @@ -12,16 +13,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import org.springframework.stereotype.Service; import redis.clients.jedis.ScanResult; import javax.annotation.Resource; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -44,6 +45,81 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl updateCondition = new QueryWrapper(); + updateCondition.eq("project_number",projectInfo.getProjectNumber()); +// .eq("project_start_date",targetBeginOn); + + + this.saveOrUpdate(projectInfo,updateCondition); + + } + }catch (Exception e){ + head.setERRORCODE("2"); + head.setRESULT("业务失败需要重做"); + return head; + } + head.setERRORCODE("0"); + head.setRESULT("成功"); + + return head; + } + @Override public IPage queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java index 8fc7b55f..ed115833 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarStandProjectTeam.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandProjectLibrary.entity.Company; import com.adc.da.slrs.sarStandProjectLibrary.entity.Head; import com.adc.da.slrs.sarStandProjectLibrary.entity.ResponseDto; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; @@ -16,6 +17,8 @@ import com.adc.da.slrs.sarStandProjectTeam.entity.SarStandProjectTeam; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; +import java.util.ArrayList; + /** *

@@ -37,8 +40,12 @@ public class SarStandProjectTeamController extends BaseController companies = new ArrayList<>(); + Company company = new Company(); + company.setCOMPANY_CODE(""); + company.setFISCAL_YEAR(""); + companies.add(company); + ResponseDto responseDto = new ResponseDto(head,companies); return responseDto; }