Dlp-Gyjd/dlp-entrustment
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/main/java/digital/laboratory/platform/entrustment/entity/EntrustmentIdentificationMaterial.java
This commit is contained in:
杨海航
2024-09-03 10:28:52 +08:00
parent ce9b81281b 8b33a66ce6
commit 4f6007ca5f
6 changed files with 73 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/main/java/digital/laboratory/platform/entrustment/controller/CaseEventController.java
View File

@@ -215,9 +215,9 @@ public class CaseEventController {
if (r.getCode() == CommonConstants.SUCCESS) { if (r.getCode() == CommonConstants.SUCCESS) {
caseOwnOrg = (SysOrg) r.getData(); caseOwnOrg = (SysOrg) r.getData();
Date happenTime = Date.from(caseEvent.getHappenTime().atZone(ZoneId.systemDefault()).toInstant()); // Date happenTime = Date.from(caseEvent.getHappenTime().atZone(ZoneId.systemDefault()).toInstant());
;
caseEvent.setCaseNo(caseEventService.getNewCaseCode(caseOwnOrg.getOrgCode(), happenTime)); caseEvent.setCaseNo(caseEventService.getNewCaseCode(caseOwnOrg.getOrgCode(), caseEvent.getHappenTime()));
} else { } else {
return R.failed(String.format("没有找到 orgId 为 %s 的机构, 请确认案件所属机构(CaseOwnOrg)的正确性!", caseEvent.getCaseOwnOrgId())); return R.failed(String.format("没有找到 orgId 为 %s 的机构, 请确认案件所属机构(CaseOwnOrg)的正确性!", caseEvent.getCaseOwnOrgId()));
} }
@@ -645,35 +645,35 @@ public class CaseEventController {
//===================================================================================== //=====================================================================================
// 测试, 创建 100 个案件 // 测试, 创建 100 个案件
@GetMapping("/create100") // @GetMapping("/create100")
public R xxx_TestCreate100() { // public R xxx_TestCreate100() {
for (int i = 0; i < 100; i++) { // for (int i = 0; i < 100; i++) {
CaseEvent cj = new CaseEvent(); // CaseEvent cj = new CaseEvent();
cj.setId(IdWorker.get32UUID().toUpperCase()); // cj.setId(IdWorker.get32UUID().toUpperCase());
String ownOrgId = "520100"; // String ownOrgId = "520100";
String ownOrgCode = "520100"; // String ownOrgCode = "520100";
cj.setHappenTime(LocalDateTime.now()); // cj.setHappenTime(LocalDateTime.now());
cj.setCaseName("第" + i + "个测试案件"); // cj.setCaseName("第" + i + "个测试案件");
cj.setCaseType(String.format("%d", RandomUtil.randomInt(1, 6))); // cj.setCaseType(String.format("%d", RandomUtil.randomInt(1, 6)));
//cj.setCriminalType(String.format("%d",RandomUtil.randomInt(1, 5)*1000)); // //cj.setCriminalType(String.format("%d",RandomUtil.randomInt(1, 5)*1000));
cj.setCaseArea(RandomUtil.randomNumbers(6)); // cj.setCaseArea(RandomUtil.randomNumbers(6));
cj.setCaseAddress(RandomUtil.randomString(100)); // cj.setCaseAddress(RandomUtil.randomString(100));
cj.setCaseOwnOrgId(ownOrgId); // cj.setCaseOwnOrgId(ownOrgId);
//
// 如果没有提供案件编码, 生成一个 // // 如果没有提供案件编码, 生成一个
Date happenTime = Date.from(cj.getHappenTime().atZone(ZoneId.systemDefault()).toInstant()); // Date happenTime = Date.from(cj.getHappenTime().atZone(ZoneId.systemDefault()).toInstant());
; // ;
cj.setCaseNo(caseEventService.getNewCaseCode(ownOrgCode, happenTime)); // cj.setCaseNo(caseEventService.getNewCaseCode(ownOrgCode, happenTime));
//
if (caseEventService.save(cj)) { // if (caseEventService.save(cj)) {
System.out.println("新增案件成功"); // System.out.println("新增案件成功");
} else { // } else {
System.out.println("新增案件失败"); // System.out.println("新增案件失败");
} // }
//
} // }
return R.ok("100 of case ware Created"); // return R.ok("100 of case ware Created");
/*this is new update*/ // /*this is new update*/
} // }
} }

3
src/main/java/digital/laboratory/platform/entrustment/entity/CaseEvent.java
View File

@@ -7,6 +7,7 @@ import digital.laboratory.platform.common.mybatis.base.BaseEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@@ -59,7 +60,7 @@ public class CaseEvent extends BaseEntity {
* 案发时间 * 案发时间
*/ */
@ApiModelProperty(value="案发时间") @ApiModelProperty(value="案发时间")
private LocalDateTime happenTime; private LocalDate happenTime;
/** /**
* 案发地详细地点 * 案发地详细地点

28
src/main/java/digital/laboratory/platform/entrustment/entity/EntrustmentIdentificationMaterial.java
View File

@@ -505,20 +505,26 @@ public class EntrustmentIdentificationMaterial extends BaseEntity {
@ApiModelProperty(value = "委托检材顺序号，由系统根据录入顺序生成") @ApiModelProperty(value = "委托检材顺序号，由系统根据录入顺序生成")
private Integer orderNo; private Integer orderNo;
@ApiModelProperty(value = "提取时间") /***************************** 贵阳新增需求 ***********************************************/
private LocalDateTime extractionTime; /**
* 提取时间--贵阳新增需求
*/
@ApiModelProperty(value = "提取时间--贵阳新增需求")
private LocalDateTime drawTime;
@ApiModelProperty(value = "打印提取时间") /**
@TableField(exist = false) * 提取地点--贵阳新增需求
private String printExtractionTime; */
@ApiModelProperty(value = "提取地点--贵阳新增需求")
private String drawPlace;
@ApiModelProperty(value = "提取地点") /**
private String extractionSite; * 包装是否完整--贵阳新增需求
*/
@ApiModelProperty(value = "包装是否完整--贵阳新增需求")
private Boolean packComplete;
@ApiModelProperty(value = "留存样个数") /*****************************************************************************************/
private Integer rtSampleQuantity;
@ApiModelProperty(value = "包装是否完整")
private boolean completePackage;
public String getOrderNo1() { public String getOrderNo1() {
return this.orderNo + "号检材"; return this.orderNo + "号检材";

3
src/main/java/digital/laboratory/platform/entrustment/service/CaseEventService.java
View File

@@ -8,6 +8,7 @@ import digital.laboratory.platform.entrustment.entity.CaseEvent;
import digital.laboratory.platform.othersys.vo.EntrustDataVo; import digital.laboratory.platform.othersys.vo.EntrustDataVo;
import digital.laboratory.platform.entrustment.vo.CaseEventVO; import digital.laboratory.platform.entrustment.vo.CaseEventVO;
import java.time.LocalDate;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -59,7 +60,7 @@ public interface CaseEventService extends IService<CaseEvent> {
* @param date * @param date
* @return * @return
*/ */
String getNewCaseCode(String caseOwnOrgCode, Date date); String getNewCaseCode(String caseOwnOrgCode, LocalDate date);
/** /**
* 检查案件是否有提交审核以后的委托存在 * 检查案件是否有提交审核以后的委托存在
*/ */

27
src/main/java/digital/laboratory/platform/entrustment/service/impl/CaseEventServiceImpl.java
View File

@@ -30,6 +30,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
@@ -119,8 +120,8 @@ public class CaseEventServiceImpl extends ServiceImpl<CaseEventMapper, CaseEvent
* @return * @return
*/ */
@Override @Override
public String getNewCaseCode(String caseOwnOrgCode, Date date) { public String getNewCaseCode(String caseOwnOrgCode, LocalDate date) {
String prefix = CommonConstants.CODE_PREFIX_CASE + caseOwnOrgCode + DateUtil.format(date, "yyyyMM"); String prefix = CommonConstants.CODE_PREFIX_CASE + caseOwnOrgCode + date.format(DateTimeFormatter.ofPattern("yyyyMM"));
int newCount = 1; int newCount = 1;
@@ -203,10 +204,10 @@ public class CaseEventServiceImpl extends ServiceImpl<CaseEventMapper, CaseEvent
public CaseEvent dealDataToCaseEvent(EntrustDataVo entrustDataVo) { public CaseEvent dealDataToCaseEvent(EntrustDataVo entrustDataVo) {
CaseEvent caseEvent = new CaseEvent(); CaseEvent caseEvent = new CaseEvent();
LocalDateTime happenTime = null; LocalDate happenTime = null;
if (StrUtil.isNotBlank(entrustDataVo.getSubmitTime())) { if (StrUtil.isNotBlank(entrustDataVo.getSubmitTime())) {
happenTime = LocalDateTime.parse(entrustDataVo.getSubmitTime(), happenTime = LocalDate.parse(entrustDataVo.getSubmitTime(),
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); DateTimeFormatter.ofPattern("yyyy-MM-dd"));
} else { } else {
throw new RuntimeException("案发时间未填"); throw new RuntimeException("案发时间未填");
} }
@@ -224,9 +225,9 @@ public class CaseEventServiceImpl extends ServiceImpl<CaseEventMapper, CaseEvent
if (StrUtil.isBlank(caseEvent.getCaseNo())) { if (StrUtil.isBlank(caseEvent.getCaseNo())) {
// 如果没有提供案件编码, 生成一个 // 如果没有提供案件编码, 生成一个
Date happenTime1 = Date.from(caseEvent.getHappenTime().atZone(ZoneId.systemDefault()).toInstant()); // Date happenTime1 = Date.from(caseEvent.getHappenTime().atZone(ZoneId.systemDefault()).toInstant());
if (StrUtil.isNotBlank(caseEvent.getCaseOwnOrgId())) { if (StrUtil.isNotBlank(caseEvent.getCaseOwnOrgId())) {
caseEvent.setCaseNo(this.getNewCaseCode(caseEvent.getCaseOwnOrgId(), happenTime1)); caseEvent.setCaseNo(this.getNewCaseCode(caseEvent.getCaseOwnOrgId(), caseEvent.getHappenTime()));
} else if (StrUtil.isNotBlank(entrustDataVo.getEntrustOrganization())) { } else if (StrUtil.isNotBlank(entrustDataVo.getEntrustOrganization())) {
SysOrg sysOrg = new SysOrg(); SysOrg sysOrg = new SysOrg();
System.out.println("---------------------------------------" + entrustDataVo.getEntrustOrganization()); System.out.println("---------------------------------------" + entrustDataVo.getEntrustOrganization());
@@ -234,9 +235,9 @@ public class CaseEventServiceImpl extends ServiceImpl<CaseEventMapper, CaseEvent
R<List<SysOrg>> listR = remoteOrgService.innerGetOrgList(sysOrg); R<List<SysOrg>> listR = remoteOrgService.innerGetOrgList(sysOrg);
if (listR.getCode() == CommonConstants.SUCCESS) { if (listR.getCode() == CommonConstants.SUCCESS) {
if (listR.getData().size() > 0) { if (listR.getData().size() > 0) {
caseEvent.setCaseNo(this.getNewCaseCode(listR.getData().get(0).getOrgCode(), happenTime1)); caseEvent.setCaseNo(this.getNewCaseCode(listR.getData().get(0).getOrgCode(), caseEvent.getHappenTime()));
} else { } else {
caseEvent.setCaseNo(this.getNewCaseCode(entrustDataVo.getCityCode(), happenTime1)); caseEvent.setCaseNo(this.getNewCaseCode(entrustDataVo.getCityCode(), caseEvent.getHappenTime()));
} }
} }
@@ -244,7 +245,7 @@ public class CaseEventServiceImpl extends ServiceImpl<CaseEventMapper, CaseEvent
// 如果还是案件编号还是空，则使用市的编码生成编号 // 如果还是案件编号还是空，则使用市的编码生成编号
if (StrUtil.isBlank(caseEvent.getCaseNo())) { if (StrUtil.isBlank(caseEvent.getCaseNo())) {
caseEvent.setCaseNo(this.getNewCaseCode(entrustDataVo.getCityCode(), happenTime1)); caseEvent.setCaseNo(this.getNewCaseCode(entrustDataVo.getCityCode(), caseEvent.getHappenTime()));
} }
@@ -277,9 +278,9 @@ public class CaseEventServiceImpl extends ServiceImpl<CaseEventMapper, CaseEvent
R r = remoteOrgService.getById(caseEvent.getCaseOwnOrgId()); R r = remoteOrgService.getById(caseEvent.getCaseOwnOrgId());
if (r.getCode() == CommonConstants.SUCCESS) { if (r.getCode() == CommonConstants.SUCCESS) {
caseOwnOrg = (SysOrg) r.getData(); caseOwnOrg = (SysOrg) r.getData();
Date happenTime = Date.from(caseEvent.getHappenTime().atZone(ZoneId.systemDefault()).toInstant()); // Date happenTime = Date.from(caseEvent.getHappenTime().atZone(ZoneId.systemDefault()).toInstant());
;
caseEvent.setCaseNo(this.getNewCaseCode(caseOwnOrg.getOrgCode(), happenTime)); caseEvent.setCaseNo(this.getNewCaseCode(caseOwnOrg.getOrgCode(), caseEvent.getHappenTime()));
} else { } else {
throw new RuntimeException(String.format("没有找到 orgId 为 %s 的机构, 请确认案件所属机构(CaseOwnOrg)的正确性!", caseEvent.getCaseOwnOrgId())); throw new RuntimeException(String.format("没有找到 orgId 为 %s 的机构, 请确认案件所属机构(CaseOwnOrg)的正确性!", caseEvent.getCaseOwnOrgId()));
} }

9
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
View File

@@ -71,6 +71,7 @@ import java.awt.image.BufferedImage;
import java.io.*; import java.io.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.security.Principal; import java.security.Principal;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.util.*; import java.util.*;
@@ -3084,7 +3085,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
CaseEvent caseEvent = new CaseEvent(); CaseEvent caseEvent = new CaseEvent();
caseEvent.setCaseName(entrustmentDTO.getCaseName()); caseEvent.setCaseName(entrustmentDTO.getCaseName());
caseEvent.setCaseBrief(entrustmentDTO.getCaseBrief()); caseEvent.setCaseBrief(entrustmentDTO.getCaseBrief());
caseEvent.setHappenTime(LocalDateTime.now()); caseEvent.setHappenTime(LocalDate.now());
caseEvent.setCaseOwnOrgId(entrustmentDTO.getClientOrgId()); caseEvent.setCaseOwnOrgId(entrustmentDTO.getClientOrgId());
if (StrUtil.isBlank(caseEvent.getCaseNo())) { if (StrUtil.isBlank(caseEvent.getCaseNo())) {
@@ -3095,9 +3096,9 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
R r = remoteOrgService.getById(caseEvent.getCaseOwnOrgId()); R r = remoteOrgService.getById(caseEvent.getCaseOwnOrgId());
if (r.getCode() == CommonConstants.SUCCESS) { if (r.getCode() == CommonConstants.SUCCESS) {
caseOwnOrg = (SysOrg) r.getData(); caseOwnOrg = (SysOrg) r.getData();
Date happenTime = Date.from(caseEvent.getHappenTime().atZone(ZoneId.systemDefault()).toInstant()); // Date happenTime = Date.from(caseEvent.getHappenTime().atZone(ZoneId.systemDefault()).toInstant());
;
caseEvent.setCaseNo(caseEventService.getNewCaseCode(caseOwnOrg.getOrgCode(), happenTime)); caseEvent.setCaseNo(caseEventService.getNewCaseCode(caseOwnOrg.getOrgCode(), caseEvent.getHappenTime()));
} else { } else {
throw new RuntimeException(String.format("没有找到 orgId 为 %s 的机构, 请确认案件所属机构(CaseOwnOrg)的正确性!", caseEvent.getCaseOwnOrgId())); throw new RuntimeException(String.format("没有找到 orgId 为 %s 的机构, 请确认案件所属机构(CaseOwnOrg)的正确性!", caseEvent.getCaseOwnOrgId()));
} }