WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
wangzhijiang
2022-06-20 18:13:53 +08:00
parent 41d1e36261 326e357428
commit 68fadab0f5
33 changed files with 1211 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+12 -10
View File
@@ -608,10 +608,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
if ("issue_time".equals(onlCgformField.getDbFieldName())) {
map.put("sort", "true");//列表排序标识
}
// if ("issue_time".equals(onlCgformField.getDbFieldName())
// || "implement_time".equals(onlCgformField.getDbFieldName())) {
// map.put("sort", "true");//列表排序标识
// }
map.put("db_field_name", onlCgformField.getDbFieldName());//字段
if (CutEnum.CN.getValue().equals(cut)) {
map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
@@ -1592,16 +1588,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
String issueTime = (String) (map.get("issue_time"));
Date issueTimeDate = df.parse(issueTime);
Date issueTimeDate = null;
if(StringUtils.isNotBlank(issueTime)){
issueTimeDate = df.parse(issueTime);
}
String implementTime = (String) map.get("implement_time");//在产车实施日期
String newCarimplementTime = (String) map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1");//新车型实施日期
if (StringUtils.isNotBlank(implementTime)) {
if (StringUtils.isNotBlank(implementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
Date implementTimeDate = df.parse(implementTime);
if (issueTimeDate.after(implementTimeDate)) {
throw new JeroBootException("发布日期不能大于在产车实施日期");
}
}
if (StringUtils.isNotBlank(newCarimplementTime)) {
if (StringUtils.isNotBlank(newCarimplementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
Date newCarimplementTimeDate = df.parse(newCarimplementTime);
if (issueTimeDate.after(newCarimplementTimeDate)) {
throw new JeroBootException("发布日期不能大于新车型实施日期");
@@ -2201,16 +2200,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
try {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
String issueTime = (String) map.get("issue_time");
Date issueTimeDate = df.parse(issueTime);
Date issueTimeDate = null;
if(StringUtils.isNotBlank(issueTime)){
issueTimeDate = df.parse(issueTime);
}
String implementTime = (String) map.get("implement_time");//在产车实施日期
String newCarimplementTime = (String) map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1");//新车型实施日期
if (StringUtils.isNotBlank(implementTime)) {
if (StringUtils.isNotBlank(implementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
Date implementTimeDate = df.parse(implementTime);
if (issueTimeDate.after(implementTimeDate)) {
throw new JeroBootException("发布日期不能大于在产车实施日期");
}
}
if (StringUtils.isNotBlank(newCarimplementTime)) {
if (StringUtils.isNotBlank(newCarimplementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
Date newCarimplementTimeDate = df.parse(newCarimplementTime);
if (issueTimeDate.after(newCarimplementTimeDate)) {
throw new JeroBootException("发布日期不能大于新车型实施日期");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java
+15
View File
@@ -11,6 +11,7 @@ import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
import com.jero.modules.dummy.enums.InventoryStateEnum;
import com.jero.modules.dummy.service.IDummyInventoryBaseEOService;
import com.jero.modules.dummy.vo.VirtualCreaterVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -110,6 +111,20 @@ public class DummyInventoryBaseEOController extends JeroController<DummyInventor
return Result.OK("编辑成功!");
}
/**
* 设置创建人
*
* @param virtualCreaterVo
* @return
*/
@AutoLog(value = "虚拟清单基础表-设置创建人")
@ApiOperation(value="虚拟清单基础表-设置创建人", notes="虚拟清单基础表-设置创建人")
@PostMapping(value = "/setCreater")
public Result<?> setCreater(@RequestBody VirtualCreaterVo virtualCreaterVo) {
dummyInventoryBaseEOService.setCreater(virtualCreaterVo);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java
+9
View File
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
import com.jero.modules.dummy.vo.VirtualCreaterVo;
import java.util.List;
@@ -32,6 +33,14 @@ public interface IDummyInventoryBaseEOService extends IService<DummyInventoryBas
*/
void editById(DummyInventoryBaseEO dummyInventoryBaseEO);
/**
* 虚拟清单创建人更新
*
* @param VirtualCreaterVo
* @return
*/
void setCreater(VirtualCreaterVo virtualCreaterVo);
/**
* 发布
* @param dummyInventoryBaseEO
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+11 -2
View File
@@ -24,6 +24,7 @@ import com.jero.modules.dummy.service.IDummyInventoryBaseEOService;
import com.jero.modules.dummy.service.IDummyInventoryInfoEOService;
import com.jero.modules.dummy.service.IDummyReadEOService;
import com.jero.modules.dummy.util.ListDiff;
import com.jero.modules.dummy.vo.VirtualCreaterVo;
import com.jero.modules.feishu.service.IFeishuService;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
@@ -116,7 +117,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
@Override
public void editById(DummyInventoryBaseEO dummyInventoryBaseEO) {
DummyInventoryBaseEO baseEO = queryById(dummyInventoryBaseEO.getId());
List<String> createByNameList =new ArrayList<>();
List<String> createByNameList = new ArrayList<>();
if (StringUtils.isNotBlank(dummyInventoryBaseEO.getCreateBy())) {
createByNameList = Arrays.asList(dummyInventoryBaseEO.getCreateBy().split(","));
@@ -140,7 +141,15 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
saveOrUpdate(dummyInventoryBaseEO);
}
@Override
public void setCreater(VirtualCreaterVo virtualCreaterVo) {
String[] idList = virtualCreaterVo.getIds().split(",");
for (int i = 0; i < idList.length; i++){
DummyInventoryBaseEO baseEO = queryById(idList[i]);
baseEO.setCreateBy(virtualCreaterVo.getCreateBy());
saveOrUpdate(baseEO);
}
}
/**
* 通过id删除
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/vo/VirtualCreaterVo.java
+16
View File
@@ -0,0 +1,16 @@
package com.jero.modules.dummy.vo;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@Data
@ApiModel(value="VirtualCreaterVo对象", description="虚拟清单创建人修改VO")
public class VirtualCreaterVo {
// 需要修改的虚拟清单id，可能多个
private String ids;
// 需要修改的创建人
private String createBy;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+22 -4
View File
@@ -34,10 +34,11 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
@@ -75,9 +76,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("*",""));
}
// List<SysUser> sysUserList = sysUserService.list();
QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
userQueryWrapper.select("id", "username");
List<SysUser> sysUserList = this.sysUserService.list(userQueryWrapper);
ncrTrackVO.setInconformity(ReviewResultEnum.INCONFORMITY.getValue());
ncrTrackVO.setTrack(ReviewResultEnum.TO_TRACK.getValue());
@@ -97,6 +96,25 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
verifyName = "Verify conformance validation";
}
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
Set<String> userIdSet = new HashSet<>();
for (NcrTrackVO trackVO : infoList) {
if(StringUtils.isNotBlank(trackVO.getDesignInitiatorId())){
userIdSet.add(trackVO.getDesignInitiatorId());
}
if(StringUtils.isNotBlank(trackVO.getPrehomoInitiatorId())){
userIdSet.add(trackVO.getPrehomoInitiatorId());
}
if(StringUtils.isNotBlank(trackVO.getVerifyInitiatorId())){
userIdSet.add(trackVO.getVerifyInitiatorId());
}
}
List<SysUser> sysUserList = new ArrayList<>();
if(userIdSet.size() != 0){
QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
userQueryWrapper.lambda().in(SysUser::getId,userIdSet);
userQueryWrapper.select("id", "username");
sysUserList = this.sysUserService.list(userQueryWrapper);
}
for (NcrTrackVO trackVO : infoList) {
//责任领域中英文切换
if(StringUtils.isNotBlank(trackVO.getDutyTerritory())){