update

src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java

@@ -1515,8 +1515,8 @@ public class EntrustmentController {
     @SysLog("创建鉴定委托书")
     @GetMapping("/el")
 //	@PreAuthorize("@pms.hasPermission('EntrustmentEdit')")
-    public void bizGetPDFEntrustmentLetter(String id, HttpServletRequest theHttpServletRequest, HttpServletResponse httpServletResponse) {
+    public String  bizGetPDFEntrustmentLetter(String id, HttpServletRequest theHttpServletRequest, HttpServletResponse httpServletResponse) {
-        entrustmentService.bizGetPDFEntrustmentLetter(id, theHttpServletRequest, httpServletResponse);
+        return entrustmentService.bizGetPDFEntrustmentLetter(id, theHttpServletRequest, httpServletResponse);
     }
 
     /**

src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentIdentificationMaterialController.java

@@ -210,7 +210,7 @@ public class EntrustmentIdentificationMaterialController {
      * sample2Quantity
      * sample2BoxId
      *
-     * @param identificationMaterial
+     * @param List<EntrustmentIdentificationMaterial>
      * @return
      */
 
@@ -243,10 +243,10 @@ public class EntrustmentIdentificationMaterialController {
     @SysLog("受理人保存检材信息")
     @PutMapping("/accept_save")
     @PreAuthorize("@pms.hasPermission('EntrustmentAccept')")
-    public R<EntrustmentIdentificationMaterial> bizAccept_Save(@RequestBody EntrustmentIdentificationMaterial identificationMaterial, HttpServletRequest theHttpServletRequest) {
+    public R<List<EntrustmentIdentificationMaterial>> bizAccept_Save(@RequestBody List<EntrustmentIdentificationMaterial> materialList, HttpServletRequest theHttpServletRequest) {
         Principal principal = theHttpServletRequest.getUserPrincipal();
         DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
-        return R.ok(entrustmentIdentificationMaterialService.bizAccept_Save(identificationMaterial, dlpUser), "保存检材信息成功");
+        return R.ok(entrustmentIdentificationMaterialService.bizAccept_Save(materialList, dlpUser), "保存检材信息成功");
     }
 
 
@@ -919,20 +919,20 @@ public class EntrustmentIdentificationMaterialController {
     }
 
 
-    /**
+//    /**
-     * 添加复秤信息的保存接口  还没增加权限控制
+//     * 添加复秤信息的保存接口  还没增加权限控制
-     *
+//     *
-     * @param id
+//     * @param id
-     * @param sample1RepeatWeigh
+//     * @param sample1RepeatWeigh
-     * @param sample2RepeatWeigh
+//     * @param sample2RepeatWeigh
-     * @return
+//     * @return
-     */
+//     */
-    @PostMapping("/saveRepWeigh")
+//    @PostMapping("/saveRepWeigh")
-    @ApiOperation(value = "保存复秤信息", notes = "保存复秤信息")
+//    @ApiOperation(value = "保存复秤信息", notes = "保存复秤信息")
-    @GlobalTransactional
+//    @GlobalTransactional
-    public R saveRepWeigh(String id, double sample1RepeatWeigh, double sample2RepeatWeigh, boolean isUseBalance, String sampleFlag) {
+//    public R saveRepWeigh(String id, double sample1RepeatWeigh, double sample2RepeatWeigh, boolean isUseBalance, String sampleFlag) {
-        return R.ok(entrustmentIdentificationMaterialService.saveRepWeigh(id, sample1RepeatWeigh, sample2RepeatWeigh, isUseBalance, sampleFlag), "保存成功");
+//        return R.ok(entrustmentIdentificationMaterialService.saveRepWeigh(id, sample1RepeatWeigh, sample2RepeatWeigh, isUseBalance, sampleFlag), "保存成功");
-    }
+//    }
 
     //增加留存样
     @PostMapping("/settingRetained")

src/main/java/digital/laboratory/platform/entrustment/entity/EntrustmentIdentificationMaterial.java

@@ -488,7 +488,7 @@ public class EntrustmentIdentificationMaterial extends BaseEntity {
     private String analysisOptionValue;
 
     /**
-     * 数据来源，用于区别数据来自自身系统还是外部系统
+     * 数据来源，用于区别数据来自自身系统还是外部系统 、0：本系统 1：禁毒大数据平台
      */
     @ApiModelProperty(value = "数据来源")
     private Integer dataSources;
@@ -511,6 +511,12 @@ public class EntrustmentIdentificationMaterial extends BaseEntity {
      */
     @ApiModelProperty(value = "提取时间--贵阳新增需求")
     private LocalDateTime drawTime;
+    /**
+     * 提取时间--贵阳新增需求
+     */
+    @ApiModelProperty(value = "提取时间--贵阳新增需求 打印转为字符串")
+    @TableField(exist = false)
+    private String printDrawTime;
 
     /**
      * 提取地点--贵阳新增需求
@@ -524,6 +530,16 @@ public class EntrustmentIdentificationMaterial extends BaseEntity {
     @ApiModelProperty(value = "包装是否完整--贵阳新增需求")
     private Boolean packComplete;
 
+    /* 留存样个数--贵阳新增需求
+     */
+    @ApiModelProperty(value = "留存样个数--贵阳新增需求")
+    private Integer rtSampleQuantity;
+
+    /* 留存样个数--贵阳新增需求
+     */
+    @ApiModelProperty(value = "检材备注--贵阳新增需求")
+    private String  remark;
+
     /*****************************************************************************************/
 
     public String getOrderNo1() {

src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentIdentificationMaterialService.java

@@ -81,7 +81,7 @@ public interface EntrustmentIdentificationMaterialService extends IService<Entru
 
     EntrustmentIdentificationMaterial bizApprove_Apply(EntrustmentIdentificationMaterial identificationMaterial, Integer opCode, DLPUser dlpUser);
 
-    EntrustmentIdentificationMaterial bizAccept_Save(EntrustmentIdentificationMaterial identificationMaterial, DLPUser dlpUser);
+    List<EntrustmentIdentificationMaterial> bizAccept_Save(List<EntrustmentIdentificationMaterial> materialList, DLPUser dlpUser);
 
     EntrustmentIdentificationMaterial bizAccept_Apply(EntrustmentIdentificationMaterial identificationMaterial, Integer opCode, DLPUser dlpUser);
 
@@ -101,7 +101,7 @@ public interface EntrustmentIdentificationMaterialService extends IService<Entru
 
     EntrustmentIdentificationMaterial deleteById(String id);
 
-    boolean saveRepWeigh(String id, double sample1RepeatWeigh, double sample2RepeatWeigh, boolean isUseBalance, String sampleFlag);
+    boolean saveRepWeigh(EntrustmentIdentificationMaterial entrustmentIdentificationMaterial, double sample1RepeatWeigh, double sample2RepeatWeigh, boolean isUseBalance, String sampleFlag);
 
     EntrustmentIdentificationMaterial settingRetained(String id, int flag);
 

src/main/java/digital/laboratory/platform/entrustment/service/EntrustmentService.java

@@ -198,7 +198,7 @@ public interface EntrustmentService extends IService<Entrustment> {
 
 	Entrustment bizDeliver_Apply(Entrustment entrust, Integer opCode, DLPUser dlpUser);
 
-	void bizGetPDFEntrustmentLetter(String id, HttpServletRequest theHttpServletRequest, HttpServletResponse httpServletResponse);
+	String  bizGetPDFEntrustmentLetter(String id, HttpServletRequest theHttpServletRequest, HttpServletResponse httpServletResponse);
 
 	Entrustment bizAccept_Save(Entrustment entrust, DLPUser dlpUser);
 

src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java

@@ -3,6 +3,7 @@ package digital.laboratory.platform.entrustment.service.impl;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -609,7 +610,9 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
     }
 
     @Override
-    public EntrustmentIdentificationMaterial bizAccept_Save(EntrustmentIdentificationMaterial identificationMaterial, DLPUser dlpUser) {
+    public List<EntrustmentIdentificationMaterial> bizAccept_Save(List<EntrustmentIdentificationMaterial> materialList, DLPUser dlpUser) {
+
+        for (EntrustmentIdentificationMaterial identificationMaterial : materialList) {
 
             // 检查委托原来的状态
             EntrustmentIdentificationMaterial im = this.getById(identificationMaterial.getId());
@@ -629,7 +632,11 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
             if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()) {
                 throw new RuntimeException("委托不在正在受理状态");
             }
-
+            if (identificationMaterial.getSample1RepeatWeigh() != null) {
+                im.setSample1RepeatWeigh(identificationMaterial.getSample1RepeatWeigh());
+                im.setSample2RepeatWeigh(identificationMaterial.getSample2RepeatWeigh());
+                this.saveRepWeigh(im, im.getSample1RepeatWeigh().doubleValue(), im.getSample2RepeatWeigh().doubleValue(), false, "");
+            }
             // if (!dlpUser.getId().equals(entrustment.getAcceptClaimUser())) {
             // 	throw new RuntimeException(String.format("委托的受理任务是由其他人认领的。认领用户是: %s", entrustment.getAcceptClaimUser()));
             // }
@@ -638,20 +645,21 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
             //-------------------
             // 更新数据库表数据
             //-------------------
-        im.setFundQuantity(identificationMaterial.getFundQuantity());
+//        im.setFundQuantity(identificationMaterial.getFundQuantity());
-        im.setQuantity(identificationMaterial.getQuantity());
+//        im.setQuantity(identificationMaterial.getQuantity());
-
+//
-        im.setProvidedSample1No(identificationMaterial.getProvidedSample1No());
+//        im.setProvidedSample1No(identificationMaterial.getProvidedSample1No());
-        im.setProvidedSample1FundQuantity(identificationMaterial.getProvidedSample1FundQuantity());
+//        im.setProvidedSample1FundQuantity(identificationMaterial.getProvidedSample1FundQuantity());
-        im.setProvidedSample1Quantity(identificationMaterial.getProvidedSample1Quantity());
+//        im.setProvidedSample1Quantity(identificationMaterial.getProvidedSample1Quantity());
-
+//
-        im.setProvidedSample2Present(identificationMaterial.getProvidedSample2Present());
+//        im.setProvidedSample2Present(identificationMaterial.getProvidedSample2Present());
-        im.setProvidedSample2No(identificationMaterial.getProvidedSample2No());
+//        im.setProvidedSample2No(identificationMaterial.getProvidedSample2No());
-        im.setProvidedSample2FundQuantity(identificationMaterial.getProvidedSample2FundQuantity());
+//        im.setProvidedSample2FundQuantity(identificationMaterial.getProvidedSample2FundQuantity());
-        im.setProvidedSample2Quantity(identificationMaterial.getProvidedSample2Quantity());
+//        im.setProvidedSample2Quantity(identificationMaterial.getProvidedSample2Quantity());
-
+//        im.setSplitedSample(identificationMaterial.getSplitedSample());
-        im.setSplitedSample(identificationMaterial.getSplitedSample());
+//        im.setRemark(identificationMaterial.getRemark());
-
+            im.setRemark(identificationMaterial.getRemark());
+            im.setPack(identificationMaterial.getPack());
             // 如果之前没有生成过样本编号, 现在填写样本重量了, 那么就生成样本编号
             //if ((identificationMaterial.getSample1Present() != null) && identificationMaterial.getSample1Present()) {
             if (StrUtil.isBlank(identificationMaterial.getProvidedSample1No())) {
@@ -663,18 +671,6 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
                     im.setProvidedSample2No(sampleService.getNewProvidedSampleNo(im.getImNo(), 2));
                 }
             }
-
-        im.setSample1No(identificationMaterial.getSample1No());
-        im.setSample1FundQuantity(identificationMaterial.getSample1FundQuantity());
-        im.setSample1Quantity(identificationMaterial.getSample1Quantity());
-        im.setSample1BoxId(identificationMaterial.getSample1BoxId());
-
-        im.setSample2Present(identificationMaterial.getSample2Present());
-        im.setSample2No(identificationMaterial.getSample2No());
-        im.setSample2FundQuantity(identificationMaterial.getSample2FundQuantity());
-        im.setSample2Quantity(identificationMaterial.getSample2Quantity());
-        im.setSample2BoxId(identificationMaterial.getSample2BoxId());
-
             // 如果之前没有生成过样本编号, 现在填写样本重量了, 那么就生成样本编号
             //if ((identificationMaterial.getSample1Present() != null) && identificationMaterial.getSample1Present()) {
             if (StrUtil.isBlank(identificationMaterial.getSample1No())) {
@@ -686,36 +682,50 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
                     im.setSample2No(sampleService.getNewSampleNo(im.getImNo(), 2));
                 }
             }
+//        im.setSample1No(identificationMaterial.getSample1No());
+//        im.setSample1FundQuantity(identificationMaterial.getSample1FundQuantity());
+//        im.setSample1Quantity(identificationMaterial.getSample1Quantity());
+//        im.setSample1BoxId(identificationMaterial.getSample1BoxId());
+//
+//        im.setSample2Present(identificationMaterial.getSample2Present());
+//        im.setSample2No(identificationMaterial.getSample2No());
+//        im.setSample2FundQuantity(identificationMaterial.getSample2FundQuantity());
+//        im.setSample2Quantity(identificationMaterial.getSample2Quantity());
+//        im.setSample2BoxId(identificationMaterial.getSample2BoxId());
+//
+//
+//
+//        UpdateWrapper<EntrustmentIdentificationMaterial> updateWrapper = new UpdateWrapper<EntrustmentIdentificationMaterial>();
+//        updateWrapper.eq("id", im.getId());        // 查询条件是 id 相等
+//
+//        updateWrapper.set("fund_quantity", im.getFundQuantity());
+//        updateWrapper.set("quantity", im.getQuantity());
+//
+//        updateWrapper.set("provided_sample1_no", im.getProvidedSample1No());
+//        updateWrapper.set("provided_sample1_fund_quantity", im.getProvidedSample1FundQuantity());
+//        updateWrapper.set("provided_sample1_quantity", im.getProvidedSample1Quantity());
+//
+//        updateWrapper.set("provided_sample2_present", im.getProvidedSample2Present());
+//        updateWrapper.set("provided_sample2_no", im.getProvidedSample2No());
+//        updateWrapper.set("provided_sample2_fund_quantity", im.getProvidedSample2FundQuantity());
+//        updateWrapper.set("provided_sample2_quantity", im.getProvidedSample2Quantity());
+//
+//        updateWrapper.set("splited_sample", im.getSplitedSample());
+//
+//        //updateWrapper.set("sample1_present", im.getSample1Present());
+//        updateWrapper.set("sample1_no", im.getSample1No());
+//        updateWrapper.set("sample1_fund_quantity", im.getSample1FundQuantity());
+//        updateWrapper.set("sample1_quantity", im.getSample1Quantity());
+//        updateWrapper.set("sample1_box_id", im.getSample1BoxId());
+//        updateWrapper.set("sample2_present", im.getSample2Present());
+//        updateWrapper.set("sample2_no", im.getSample2No());
+//        updateWrapper.set("sample2_fund_quantity", im.getSample2FundQuantity());
+//        updateWrapper.set("sample2_quantity", im.getSample2Quantity());
+//        updateWrapper.set("sample2_box_id", im.getSample2BoxId());
+//        updateWrapper.set("remark", im.getRemark());
+//        updateWrapper.set("pack", im.getPack());
 
-        UpdateWrapper<EntrustmentIdentificationMaterial> updateWrapper = new UpdateWrapper<EntrustmentIdentificationMaterial>();
+            if (!this.updateById(im)) {
-        updateWrapper.eq("id", im.getId());        // 查询条件是 id 相等
-
-        updateWrapper.set("fund_quantity", im.getFundQuantity());
-        updateWrapper.set("quantity", im.getQuantity());
-
-        updateWrapper.set("provided_sample1_no", im.getProvidedSample1No());
-        updateWrapper.set("provided_sample1_fund_quantity", im.getProvidedSample1FundQuantity());
-        updateWrapper.set("provided_sample1_quantity", im.getProvidedSample1Quantity());
-
-        updateWrapper.set("provided_sample2_present", im.getProvidedSample2Present());
-        updateWrapper.set("provided_sample2_no", im.getProvidedSample2No());
-        updateWrapper.set("provided_sample2_fund_quantity", im.getProvidedSample2FundQuantity());
-        updateWrapper.set("provided_sample2_quantity", im.getProvidedSample2Quantity());
-
-        updateWrapper.set("splited_sample", im.getSplitedSample());
-
-        //updateWrapper.set("sample1_present", im.getSample1Present());
-        updateWrapper.set("sample1_no", im.getSample1No());
-        updateWrapper.set("sample1_fund_quantity", im.getSample1FundQuantity());
-        updateWrapper.set("sample1_quantity", im.getSample1Quantity());
-        updateWrapper.set("sample1_box_id", im.getSample1BoxId());
-        updateWrapper.set("sample2_present", im.getSample2Present());
-        updateWrapper.set("sample2_no", im.getSample2No());
-        updateWrapper.set("sample2_fund_quantity", im.getSample2FundQuantity());
-        updateWrapper.set("sample2_quantity", im.getSample2Quantity());
-        updateWrapper.set("sample2_box_id", im.getSample2BoxId());
-
-        if (!this.update(null, updateWrapper)) {
                 throw new RuntimeException("保存检材信息失败");
             }
 
@@ -724,7 +734,8 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
             if (im == null) {
                 throw new RuntimeException(String.format("没有找到 id 为 %s 的检材", identificationMaterial.getId()));
             }
-        return im;
+        }
+        return materialList;
     }
 
     @Override
@@ -1155,11 +1166,10 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
     }
 
     @Override
-    public boolean saveRepWeigh(String id, double sample1RepeatWeigh, double sample2RepeatWeigh, boolean isUseBalance, String sampleFlag) {
+    public boolean saveRepWeigh(EntrustmentIdentificationMaterial entrustmentIdentificationMaterial, double sample1RepeatWeigh, double sample2RepeatWeigh, boolean isUseBalance, String sampleFlag) {
-
         BigDecimal data1 = new BigDecimal(sample1RepeatWeigh);
         BigDecimal data2 = new BigDecimal(!Double.isNaN(sample2RepeatWeigh) ? sample2RepeatWeigh : 0);
-        EntrustmentIdentificationMaterial entrustmentIdentificationMaterial = this.getById(id);
+//        EntrustmentIdentificationMaterial entrustmentIdentificationMaterial = this.getById(id);
         entrustmentIdentificationMaterial.setSample1RepeatWeigh(data1);
         entrustmentIdentificationMaterial.setSample2RepeatWeigh(data2);
         //设置样本的重量
@@ -1232,11 +1242,13 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
 
         Entrustment entrustment = entrustmentService.getById(identificationMaterialList.get(0).getEntrustmentId());
 
-
         if (!dlpUser.isStaff() && entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) {
             throw new RuntimeException(String.format("你已提交过该委托，无法再添加检材信息!"));
         }
         for (EntrustmentIdentificationMaterial identificationMaterial : identificationMaterialList) {
+            if (StringUtils.isNotBlank(identificationMaterial.getId()) && StringUtils.isNotBlank(identificationMaterial.getSample1No())) {
+                identificationMaterial = this.putUpdateById(identificationMaterial, dlpUser);
+            } else {
                 String id = IdWorker.get32UUID().toUpperCase();
                 if (entrustment.getDataSources() == 1) {
                     EntrustOfThirdSys entrustOfThirdSys = synchronizeDataService.getOne(new LambdaQueryWrapper<EntrustOfThirdSys>().eq(EntrustOfThirdSys::getEntrustMainId, entrustment.getId()));
@@ -1324,8 +1336,14 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
                 identificationMaterial.setAcceptPassed(0);
 
                 identificationMaterial.setPackName(identificationMaterial.getPack());
-            identificationMaterial.setTypeName(entrustmentMapper.getTypeForDictionary(identificationMaterial.getType()));
+                Integer entrustmentType = entrustment.getEntrustmentType();
-
+                //检材继承委托类型
+                if (entrustmentType == 0) {
+                    identificationMaterial.setTypeName("常规毒品");
+                } else if (entrustmentType == 1) {
+                    identificationMaterial.setTypeName("生物样本");
+                }
+//            identificationMaterial.setTypeName(entrustmentMapper.getTypeForDictionary(identificationMaterial.getType()));
                 identificationMaterial.setFormName(identificationMaterial.getForm());
                 //设置序号，这里我们按先后顺序，给插入的检材排一个序号
                 identificationMaterial.setOrderNo(getWtOrderNo(identificationMaterial.getEntrustmentId()));
@@ -1338,7 +1356,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
 
                 List<EntrustmentIdentificationMaterial> list = this.list(new LambdaQueryWrapper<EntrustmentIdentificationMaterial>().eq(EntrustmentIdentificationMaterial::getProvidedSample1No, identificationMaterial.getProvidedSample1No()));
                 //如果在创建检材这
-            if (StrUtil.isBlank(identificationMaterial.getProvidedSample1No()) && list != null && list.size() > 0) {
+                if (StrUtil.isBlank(identificationMaterial.getProvidedSample1No()) || (list != null && list.size() > 0)) {
                     identificationMaterial.setProvidedSample1No(sampleService.getNewProvidedSampleNo(identificationMaterial.getImNo(), 1));
                 }
                 if ((identificationMaterial.getProvidedSample2Present() != null) && identificationMaterial.getProvidedSample2Present()) {
@@ -1366,6 +1384,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
                 identificationMaterial.setAcceptNo(null);
                 identificationMaterial.setSample1RepeatWeigh(null);
                 identificationMaterial.setSample2RepeatWeigh(null);
+                identificationMaterial.setColor("");
 
 
                 //判断检材的重量不能大于物证的重量   暂不判断，因为可能单位不统一
@@ -1385,6 +1404,7 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
                     }
                 }
             }
+        }
         return identificationMaterialList;
     }
 
@@ -1598,12 +1618,14 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
             return null;
         }
     }
+    //用作于处理一些打印委托书或鉴定事项确认书时的字段类型转换
 
     @Override
     public void conformityDrugs(List<EntrustmentIdentificationMaterial> list) {
         if (list != null && list.size() > 0) {
             for (EntrustmentIdentificationMaterial material : list) {
                 Integer analysisOption = material.getAnalysisOption();
+                material.setQuantity(material.getQuantity().setScale(2, BigDecimal.ROUND_HALF_UP));
                 switch (analysisOption) {
                     case 1:
                         material.setAnalysisOptionValue("定性分析");
@@ -1622,14 +1644,15 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
                         break;
 
                 }
-                material.setPrintExtractionTime(LocalDateTimeUtil.format(material.getExtractionTime(), "yyyy-MM-dd"));
+                material.setPrintDrawTime(LocalDateTimeUtil.format(material.getDrawTime(), "yyyy-MM-dd"));
                 List<DrugLite> candidateDrugs = material.getCandidateDrugs();
                 String drugsValue = "";
                 if (candidateDrugs == null || candidateDrugs.size() == 0) {
                     return;
                 }
                 for (int i = 0; i < candidateDrugs.size(); i++) {
-                    DrugLite drugLite = candidateDrugs.get(i);
+                    String toJSONString = JSONObject.toJSONString(candidateDrugs.get(i));
+                    DrugLite drugLite = JSONObject.parseObject(toJSONString, DrugLite.class);
                     if (i == 0) {
                         drugsValue = drugLite.getName();
                     } else {
@@ -1640,5 +1663,4 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl<En
             }
         }
     }
-
 }

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

@@ -70,6 +70,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.security.Principal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -277,7 +278,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         if (StringUtils.isNotBlank(maxAcceptNo)) {
             //判断跨年的情况，如果跨年肯定现在年份和之前年份不一样，如果是新的一年编号应该从新编号
             String seqNo = maxAcceptNo.substring(maxAcceptNo.lastIndexOf("-") + 1);
-            int newCount = Integer.valueOf(seqNo) + 1;
+            int newCount = Integer.parseInt(seqNo) + 1;
 //            String second_part = "";
 //            second_part = fillByZero(newCount);
             newAcceptNo = first_part + splitSymbol + newCount;
@@ -672,8 +673,10 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
             eg.setFormName(StringUtils.isNotBlank(item.getColor()) ? item.getColor() + item.getFormName() : "" + item.getFormName());
             eg.setSpecies(item.getTypeName());
             eg.setPack(item.getPack());
+            eg.setDrugsValue(item.getDrugsValue());
+            eg.setRtSampleQuantity(item.getRtSampleQuantity());
+            eg.setRemark(item.getRemark());
             BigDecimal totalSampleMass = new BigDecimal(0);
-
             //因为现在有的检材可以不用复称，例如送来的一支电子烟，所以我们用送检的数量与单位进行描述即可
             if (item.getSample1RepeatWeigh() == null || item.getSample1RepeatWeigh().compareTo(BigDecimal.ZERO) == 0) {
                 eg.setAnalysisSampleDes(item.getSample1Quantity() + item.getUnit());
@@ -684,11 +687,11 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
                 } else {
                     eg.setRetainedSampleDes(new BigDecimal(0) + item.getUnit());
                 }
-                eg.setTotalSampleDes(totalSampleMass + item.getUnit());
+                eg.setTotalSampleDes(totalSampleMass.setScale(2, BigDecimal.ROUND_HALF_UP) + item.getUnit());
             } else {
                 eg.setAnalysisSampleDes(item.getSample1RepeatWeigh() + "克");
                 eg.setRetainedSampleDes(item.getSample2RepeatWeigh() + "克");
-                eg.setTotalSampleDes((item.getSample1RepeatWeigh() == null ? new BigDecimal(0) : item.getSample1RepeatWeigh()).add(item.getSample2RepeatWeigh() == null ? new BigDecimal(0) : item.getSample2RepeatWeigh()) + "克");
+                eg.setTotalSampleDes((item.getSample1RepeatWeigh() == null ? new BigDecimal(0) : item.getSample1RepeatWeigh()).add(item.getSample2RepeatWeigh() == null ? new BigDecimal(0) : item.getSample2RepeatWeigh()).setScale(2, BigDecimal.ROUND_HALF_UP) + "克");
             }
             materialListForBookVoList.add(eg);
         });
@@ -1394,6 +1397,9 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
             List<EntrustmentIdentificationMaterial> materialList = entrustmentIdentificationMaterialService.list(Wrappers.<EntrustmentIdentificationMaterial>query()
                     .eq("entrustment_id", entrustment.getId())
                     .orderByAsc("create_time"));
+            if (materialList == null || materialList.size() == 0) {
+                throw new RuntimeException("请至少添加一个检材后再提交!");
+            }
             entrustment.setEntrustRequirement(this.buildEntrustReq(materialList));
             this.updateById(entrustment);
             result = entrustment;
@@ -2131,7 +2137,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
     }
 
     @Override
-    public void bizGetPDFEntrustmentLetter(String id, HttpServletRequest theHttpServletRequest, HttpServletResponse httpServletResponse) {
+    public String bizGetPDFEntrustmentLetter(String id, HttpServletRequest theHttpServletRequest, HttpServletResponse httpServletResponse) {
 
         System.out.println("bizGenerateEntrustmentWord.................");
         Principal principal = theHttpServletRequest.getUserPrincipal();
@@ -2140,17 +2146,20 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         EntrustmentVO ev = getEntrustmentVOAndVaildData(id, dlpUser);
         String entrustmentLetterFileName = "鉴定委托书" + "-" + ev.getEntrustmentNo();
         // 转换临时目录中的 word 文档为 PDF
-        String pdfFilePath = OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + ev.getId() + "/" + entrustmentLetterFileName + ".pdf";
+        String pdfFilePath = OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + ev.getId() + "/" + entrustmentLetterFileName + ".docx";
         try {
             if (!ossFile.objectExist(pdfFilePath)) {
                 GenerateEntrustmentLetterPDF(ev);
+                return pdfFilePath;
             }
-            ossFile.fileGet(pdfFilePath, httpServletResponse.getOutputStream());
+            return pdfFilePath;
-            httpServletResponse.setContentType(new MimetypesFileTypeMap().getContentType(entrustmentLetterFileName));
+//            ossFile.fileGet(pdfFilePath, httpServletResponse.getOutputStream());
+//            httpServletResponse.setContentType(new MimetypesFileTypeMap().getContentType(entrustmentLetterFileName));
         } catch (Exception e) {
             System.out.println(String.format("minioFile objectExist() Exception. %s", e.getLocalizedMessage()));
             e.printStackTrace();
         }
+        return null;
     }
 
     /**
@@ -2203,9 +2212,9 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
                 throw new RuntimeException("保存委托日期失败");
             }
         }
-        String oldIdentificationBrief = ev.getOldIdentificationBrief();
+        String oldIdentificationResult = ev.getOldIdentificationResult();
         String oldIdentification = "";
-        switch (oldIdentificationBrief) {
+        switch (oldIdentificationResult) {
             case "首次鉴定":
                 oldIdentification = "☑首次鉴定；□补充鉴定；□重新鉴定";
                 break;
@@ -2278,23 +2287,21 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
 
         //------------
         ByteArrayInputStream fisWord = new ByteArrayInputStream(fosWord.toByteArray());
-        fosWord.close();
+
 
         //MockMultipartFile mockMultipartFile = new MockMultipartFile("file", entrustmentLetterFileName + ".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", fisWord);
-        MockMultipartFile mockMultipartFile = new MockMultipartFile("file", entrustmentLetterFileName + ".docx", "image/jpg", fisWord);
+//        MockMultipartFile mockMultipartFile = new MockMultipartFile("file", entrustmentLetterFileName + ".docx", "image/jpg", fisWord);
-        Response response = remoteWord2PDFService.word2pdf(mockMultipartFile);
+////        Response response = remoteWord2PDFService.word2pdf(mockMultipartFile);
+////        fisWord.close();
+//        ByteArrayOutputStream outPDF = new ByteArrayOutputStream();
+////        IoUtil.copy(response.body().asInputStream(), outPDF, IoUtil.DEFAULT_BUFFER_SIZE);
+//        ByteArrayInputStream isPDF = new ByteArrayInputStream(outPDF.toByteArray());
+//        outPDF.close();
+
+        boolean fileSave = ossFile.fileSave(OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + ev.getId() + "/" + entrustmentLetterFileName + ".docx", fisWord);
+        fosWord.close();
         fisWord.close();
-
+        System.out.println(String.format("转换为 Word 结束"));
-
-        ByteArrayOutputStream outPDF = new ByteArrayOutputStream();
-        IoUtil.copy(response.body().asInputStream(), outPDF, IoUtil.DEFAULT_BUFFER_SIZE);
-        ByteArrayInputStream isPDF = new ByteArrayInputStream(outPDF.toByteArray());
-        outPDF.close();
-
-        boolean fileSave = ossFile.fileSave(OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + ev.getId() + "/" + entrustmentLetterFileName + ".pdf", isPDF);
-        isPDF.close();
-
-        System.out.println(String.format("转换为 PDF 结束"));
         return fileSave;
     }
 

src/main/java/digital/laboratory/platform/entrustment/vo/MaterialListForBookVo.java

@@ -22,4 +22,8 @@ public class MaterialListForBookVo {
     private String totalSampleDes;//总计描述
     private String species;//种类
     private String pack;//包装
+
+    private String drugsValue;//疑似物种类
+    private Integer rtSampleQuantity;//留存样个数
+    private String remark;//备注
 }

src/main/resources/bootstrap.yml

@@ -51,7 +51,7 @@ spring:
 
 # 文件上传相关 支持阿里云、华为云、腾讯、minio
 oss:
-  endpoint: http://127.0.0.1:9000
+  endpoint: dlp-minio:9000
   accessKey: admin
   secretKey: 87990016
   bucket-name: dlpfiles

src/main/resources/mapper/EntrustmentMapper.xml

@@ -266,7 +266,7 @@
     WHERE entrustment_no LIKE concat(#{prefix}, '%')
   </select>
   <select id="getMaxEntrustAcceptNo" parameterType="String"  resultType="java.lang.String">
-    SELECT MAX(accept_no) AS maxno
+    SELECT MAX(CAST(SUBSTRING(accept_no, 6) AS UNSIGNED)) AS maxno
     FROM b_entrustment
     WHERE accept_no LIKE concat(#{prefix}, '%')
   </select>