suojin
/
project_husbandry_back
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、委托单编号的生成的计算方式修改

Browse Source
dev
a15234804788@163.com 3 years ago
parent b20d173dc1
commit 383c8a0e76
3 changed files with 36 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 45
      lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
  2. 5
      lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EntrustMapper.java
  3. 9
      lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EntrustMapper.xml

45
lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
Unescape View File

@ -26,6 +26,7 @@ import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.springblade.common.utils.ZipCompressUtil;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.lims.entry.*;
import org.springblade.lims.mapper.EntrustMapper;
import org.springblade.lims.service.*;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
@ -103,6 +104,7 @@ public class EntrustController extends BladeController {
private final IMessageClient messageClient;
private final EntrustMapper entrustMapper;
/**
* 1.分页 委托单表
*/
@ -1472,67 +1474,68 @@ public class EntrustController extends BladeController {
// .or()
// .eq(Entrust::getIsDeleted, 1)
// );
wrapper.ge(Entrust::getCreateTime, parse).ne(Entrust::getEntrustStatus, -1);
List<Entrust> entrusts = service.list(wrapper);
wrapper.eq(Entrust::getIsDeleted , 1);
List<Entrust> entrustIsDeleted = service.list(wrapper);
// wrapper.ge(Entrust::getCreateTime, parse).ne(Entrust::getEntrustStatus, -1);
// List<Entrust> entrusts = service.list(wrapper);
Entrust entrust = new Entrust();
entrust.setInvestigativeType(number);
entrust.setCreateTime(parse);
List<Entrust> entrusts = entrustMapper.entrustListNonStatus(entrust);
// 设置受理编号
String acceptance = "";
if ("1".equals(number)) {
if (entrusts.size() >= 0 && entrusts.size() < 9) {
acceptance = "SDCADC-W-" + year + "000" + (entrusts.size() + entrustIsDeleted.size() + 1);
acceptance = "SDCADC-W-" + year + "000" + (entrusts.size() + 1);
}
if (entrusts.size() >= 9 && entrusts.size() < 99) {
acceptance = "SDCADC-W-" + year + "00" + (entrusts.size() + entrustIsDeleted.size() + 1);
acceptance = "SDCADC-W-" + year + "00" + (entrusts.size() + + 1);
}
if (entrusts.size() >= 99 && entrusts.size() < 999) {
acceptance = "SDCADC-W-" + year + "0" + (entrusts.size() + entrustIsDeleted.size() + 1);
acceptance = "SDCADC-W-" + year + "0" + (entrusts.size() + 1);
}
if (entrusts.size() >= 999 && entrusts.size() < 9999) {
acceptance = "SDCADC-W-" + year + (entrusts.size() + entrustIsDeleted.size() + 1);
acceptance = "SDCADC-W-" + year + (entrusts.size() + 1);
}
}
if ("2".equals(number)) {
if (entrusts.size() >= 0 && entrusts.size() < 9) {
acceptance = "SDCADC-J-" + year + "000" + (entrusts.size() + entrustIsDeleted.size() + 1);
acceptance = "SDCADC-J-" + year + "000" + (entrusts.size() + 1);
}
if (entrusts.size() >= 9 && entrusts.size() < 99) {
acceptance = "SDCADC-J-" + year + "00" + (entrusts.size() + entrustIsDeleted.size() + 1);
acceptance = "SDCADC-J-" + year + "00" + (entrusts.size() + 1);
}
if (entrusts.size() >= 99 && entrusts.size() < 999) {
acceptance = "SDCADC-J-" + year + "0" + (entrusts.size() + entrustIsDeleted.size() + 1);
acceptance = "SDCADC-J-" + year + "0" + (entrusts.size() + 1);
}
if (entrusts.size() >= 999 && entrusts.size() < 9999) {
acceptance = "SDCADC-J-" + year + (entrusts.size() + entrustIsDeleted.size() + 1);
acceptance = "SDCADC-J-" + year + (entrusts.size() + 1);
}
}
if ("3".equals(number)) {
if (entrusts.size() >= 0 && entrusts.size() < 9) {
acceptance = "SDCADC-Z-" + year + "000" + (entrusts.size() + entrustIsDeleted.size() + 1);
acceptance = "SDCADC-Z-" + year + "000" + (entrusts.size() + 1);
}
if (entrusts.size() >= 9 && entrusts.size() < 99) {
acceptance = "SDCADC-Z-" + year + "00" + (entrusts.size() + entrustIsDeleted.size() + 1);
acceptance = "SDCADC-Z-" + year + "00" + (entrusts.size() + 1);
}
if (entrusts.size() >= 99 && entrusts.size() < 999) {
acceptance = "SDCADC-Z-" + year + "0" + (entrusts.size() + entrustIsDeleted.size() + 1);
acceptance = "SDCADC-Z-" + year + "0" + (entrusts.size() + 1);
}
if (entrusts.size() >= 999 && entrusts.size() < 9999) {
acceptance = "SDCADC-Z-" + year + (entrusts.size() + entrustIsDeleted.size() + 1);
acceptance = "SDCADC-Z-" + year + (entrusts.size() + 1);
}
}
if ("4".equals(number)) {
if (entrusts.size() >= 0 && entrusts.size() < 9) {
acceptance = "SDCADC-S-" + year + "000" + (entrusts.size() + entrustIsDeleted.size() + 1);
acceptance = "SDCADC-S-" + year + "000" + (entrusts.size() + 1);
}
if (entrusts.size() >= 9 && entrusts.size() < 99) {
acceptance = "SDCADC-S-" + year + "00" + (entrusts.size() + entrustIsDeleted.size() + 1);
acceptance = "SDCADC-S-" + year + "00" + (entrusts.size() + 1);
}
if (entrusts.size() >= 99 && entrusts.size() < 999) {
acceptance = "SDCADC-S-" + year + "0" + (entrusts.size() + entrustIsDeleted.size() + 1);
acceptance = "SDCADC-S-" + year + "0" + (entrusts.size() + 1);
}
if (entrusts.size() >= 999 && entrusts.size() < 9999) {
acceptance = "SDCADC-S-" + year + (entrusts.size() + entrustIsDeleted.size() + 1);
acceptance = "SDCADC-S-" + year + (entrusts.size() + 1);
}
}
return acceptance;

5
lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EntrustMapper.java
Unescape View File

@ -2,8 +2,11 @@
package org.springblade.lims.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import feign.Param;
import org.springblade.lims.entry.Entrust;
import java.util.List;
/**
* 检测知识库明细表 Mapper 接口
*
@ -12,6 +15,6 @@ import org.springblade.lims.entry.Entrust;
*/
public interface EntrustMapper extends BaseMapper<Entrust> {
List<Entrust> entrustListNonStatus(@Param Entrust entrust);
}

9
lab-service/lab-lims/src/main/java/org/springblade/lims/mapper/EntrustMapper.xml
Unescape View File

@ -8,6 +8,13 @@
<result column="sample_name" property="sampleName"/>
</resultMap>
<select id="entrustListNonStatus" parameterType="org.springblade.lims.entry.Entrust" resultType="org.springblade.lims.entry.Entrust">
SELECT
*
FROM
f_entrust_main
WHERE
investigative_type = #{investigativeType} AND create_time >= #{createTime} AND entrust_status &lt;&gt; - 1
</select>
</mapper>

Write Preview
Loading…
Cancel
Save