Browse Source

update

yangzhenli
yangzhenli 1 year ago
parent
commit
ab75cd0469
  1. 5
      jnpf-tendering-controller/src/main/java/jnpf/controller/BiddingProjectSubscribeController.java
  2. 7
      jnpf-tendering-controller/src/main/java/jnpf/controller/Bidding_project_statisticsController.java
  3. 2435
      jnpf-tendering-controller/src/main/java/jnpf/controller/util/SwapUtil.java

5
jnpf-tendering-controller/src/main/java/jnpf/controller/BiddingProjectSubscribeController.java

@ -11,6 +11,7 @@ import jnpf.base.vo.DownloadVO;
import jnpf.base.vo.PageListVO; import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO; import jnpf.base.vo.PaginationVO;
import jnpf.constant.FileTypeConstant; import jnpf.constant.FileTypeConstant;
import jnpf.controller.util.SwapUtil;
import jnpf.entity.BiddingProjectSubscribeEntity; import jnpf.entity.BiddingProjectSubscribeEntity;
import jnpf.exception.DataException; import jnpf.exception.DataException;
import jnpf.file.FileApi; import jnpf.file.FileApi;
@ -49,7 +50,7 @@ import java.util.Map;
@AllArgsConstructor @AllArgsConstructor
public class BiddingProjectSubscribeController { public class BiddingProjectSubscribeController {
private final GeneraterSwapUtil generaterSwapUtil; private final SwapUtil generaterSwapUtil;
private final FileApi fileApi; private final FileApi fileApi;
private final FileUploadApi fileUploadApi; private final FileUploadApi fileUploadApi;
@ -126,7 +127,7 @@ public class BiddingProjectSubscribeController {
UserInfo userInfo = userProvider.get(); UserInfo userInfo = userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
bidding_project_subscribeForm = JsonUtil.getJsonToBean( bidding_project_subscribeForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(BiddingProjectSubscribeConstant.getFormData(), bidding_project_subscribeForm), BiddingProjectSubscribeForm.class); SwapUtil.swapDatetime(BiddingProjectSubscribeConstant.getFormData(), bidding_project_subscribeForm), BiddingProjectSubscribeForm.class);
BiddingProjectSubscribeEntity entity = JsonUtil.getJsonToBean(bidding_project_subscribeForm, BiddingProjectSubscribeEntity.class); BiddingProjectSubscribeEntity entity = JsonUtil.getJsonToBean(bidding_project_subscribeForm, BiddingProjectSubscribeEntity.class);
entity.setPlanSubmissionTime(new Date()); entity.setPlanSubmissionTime(new Date());
if (bidding_project_subscribeForm.getManagementStyle().equals("2")) { if (bidding_project_subscribeForm.getManagementStyle().equals("2")) {

7
jnpf-tendering-controller/src/main/java/jnpf/controller/Bidding_project_statisticsController.java

@ -17,6 +17,7 @@ import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO; import jnpf.base.vo.PaginationVO;
import jnpf.config.ConfigValueUtil; import jnpf.config.ConfigValueUtil;
import jnpf.constant.FileTypeConstant; import jnpf.constant.FileTypeConstant;
import jnpf.controller.util.SwapUtil;
import jnpf.entity.Bidding_project_statisticsEntity; import jnpf.entity.Bidding_project_statisticsEntity;
import jnpf.exception.DataException; import jnpf.exception.DataException;
import jnpf.file.FileApi; import jnpf.file.FileApi;
@ -56,7 +57,7 @@ import java.util.stream.Collectors;
public class Bidding_project_statisticsController { public class Bidding_project_statisticsController {
@Autowired @Autowired
private GeneraterSwapUtil generaterSwapUtil; private SwapUtil generaterSwapUtil;
@Autowired @Autowired
private UserProvider userProvider; private UserProvider userProvider;
@ -364,7 +365,7 @@ public class Bidding_project_statisticsController {
UserInfo userInfo = userProvider.get(); UserInfo userInfo = userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
bidding_project_statisticsForm = JsonUtil.getJsonToBean( bidding_project_statisticsForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(Bidding_project_statisticsConstant.getFormData(), bidding_project_statisticsForm), Bidding_project_statisticsForm.class); SwapUtil.swapDatetime(Bidding_project_statisticsConstant.getFormData(), bidding_project_statisticsForm), Bidding_project_statisticsForm.class);
Bidding_project_statisticsEntity entity = JsonUtil.getJsonToBean(bidding_project_statisticsForm, Bidding_project_statisticsEntity.class); Bidding_project_statisticsEntity entity = JsonUtil.getJsonToBean(bidding_project_statisticsForm, Bidding_project_statisticsEntity.class);
entity.setId(mainId); entity.setId(mainId);
bidding_project_statisticsService.save(entity); bidding_project_statisticsService.save(entity);
@ -390,7 +391,7 @@ public class Bidding_project_statisticsController {
Bidding_project_statisticsEntity entity = bidding_project_statisticsService.getInfo(id); Bidding_project_statisticsEntity entity = bidding_project_statisticsService.getInfo(id);
if (entity != null) { if (entity != null) {
bidding_project_statisticsForm = JsonUtil.getJsonToBean( bidding_project_statisticsForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(Bidding_project_statisticsConstant.getFormData(), bidding_project_statisticsForm), Bidding_project_statisticsForm.class); SwapUtil.swapDatetime(Bidding_project_statisticsConstant.getFormData(), bidding_project_statisticsForm), Bidding_project_statisticsForm.class);
Bidding_project_statisticsEntity subentity = JsonUtil.getJsonToBean(bidding_project_statisticsForm, Bidding_project_statisticsEntity.class); Bidding_project_statisticsEntity subentity = JsonUtil.getJsonToBean(bidding_project_statisticsForm, Bidding_project_statisticsEntity.class);
boolean b1 = bidding_project_statisticsService.updateById(subentity); boolean b1 = bidding_project_statisticsService.updateById(subentity);
if (!b1) { if (!b1) {

2435
jnpf-tendering-controller/src/main/java/jnpf/controller/util/SwapUtil.java

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save