试验相关

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/TrialSampleInfoDTO.java

@@ -0,0 +1,16 @@
+package org.springblade.business.dto;
+
+import lombok.Data;
+import org.springblade.business.entity.TrialSampleInfo;
+
+
+@Data
+public class TrialSampleInfoDTO extends TrialSampleInfo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 进场材料id
+     */
+    private Long mobilizationId;
+
+}

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/TrialMaterialMobilization.java

@@ -15,7 +15,7 @@ public class TrialMaterialMobilization extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 记录人
+     * 记录人id
      */
     private Long userId;
 

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/TrialSampleInfo.java

@@ -15,7 +15,7 @@ public class TrialSampleInfo extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 记录人
+     * 取样人
      */
     private Long userId;
 

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/TrialSamplingRecord.java

@@ -6,8 +6,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 
-import java.util.Date;
-
 @Data
 @TableName("u_trial_sampling_record")
 @EqualsAndHashCode(callSuper = true)
@@ -16,33 +14,13 @@ public class TrialSamplingRecord extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 样品编号
-     */
-    private String specificationNumber;
-
-    /**
-     * 样品名称
-     */
-    private String materialName;
-
-    /**
-     * 取样时间
-     */
-    private Date samplingDate;
-
-    /**
-     * 取样人
-     */
-    private Long userId;
-
-    /**
-     * 试样数量
+     * 进场材料id
      */
-    private Integer materialCount;
+    private Long mobilizationId;
 
     /**
-     * 是否委外 '0'=否 '1'=是
+     * 样品材料id
      */
-    private Integer isOutsourcing;
+    private Long sampleInfoId;
 
 }

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialMaterialController.java

@@ -1,12 +1,11 @@
 package org.springblade.business.controller;
 
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springblade.business.dto.TrialSampleInfoDTO;
 import org.springblade.business.entity.TrialMaterialMobilization;
 import org.springblade.business.entity.TrialSampleInfo;
 import org.springblade.business.excel.TrialMaterialMobilizationExcel;
@@ -22,17 +21,13 @@ import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.system.entity.Region;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @AllArgsConstructor
@@ -118,7 +113,7 @@ public class TrialMaterialController extends BladeController {
     @PostMapping("/sample/submit")
     @ApiOperationSupport(order = 11)
     @ApiOperation(value = "材料取样新增或修改", notes = "传入TrialSampleInfo对象")
-    public R<Object> sampleSubmit(@Valid @RequestBody TrialSampleInfo obj) {
+    public R<Object> sampleSubmit(@Valid @RequestBody TrialSampleInfoDTO obj) {
         return R.status(iTrialSampleInfoService.sampleSubmit(obj));
     }
 
@@ -152,9 +147,12 @@ public class TrialMaterialController extends BladeController {
         iTrialSampleInfoService.sampleExportPdf(ids, response);
     }
 
-
-
-
+    @PostMapping("/sample/relation-material")
+    @ApiOperationSupport(order = 16)
+    @ApiOperation(value = "关联进场材料", notes = "传入材料id")
+    public R<Object> sampleRelationMaterial(@Valid @RequestParam String id) {
+        return R.status(iTrialSampleInfoService.sampleRelationMaterial(id));
+    }
 
 
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TrialSamplingRecordMapper.java

@@ -0,0 +1,8 @@
+package org.springblade.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.business.entity.TrialSamplingRecord;
+
+public interface TrialSamplingRecordMapper extends BaseMapper<TrialSamplingRecord> {
+
+}

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TrialSamplingRecordMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.business.mapper.TrialSamplingRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="ResultEntityMap" type="org.springblade.business.entity.TrialSamplingRecord">
+        <result column="id" property="id"/>
+        <result column="mobilization_id" property="mobilizationId"/>
+        <result column="specification_number" property="specificationNumber"/>
+        <result column="material_name" property="materialName"/>
+        <result column="sampling_date" property="samplingDate"/>
+        <result column="user_id" property="userId"/>
+        <result column="material_count" property="materialCount"/>
+        <result column="is_outsourcing" property="isOutsourcing"/>
+    </resultMap>
+
+
+</mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/ITrialSampleInfoService.java

@@ -1,6 +1,7 @@
 package org.springblade.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.business.dto.TrialSampleInfoDTO;
 import org.springblade.business.entity.TrialSampleInfo;
 import org.springblade.business.excel.TrialSampleInfoExcel;
 import org.springblade.business.vo.TrialSampleInfoVO;
@@ -15,7 +16,7 @@ public interface ITrialSampleInfoService extends BaseService<TrialSampleInfo> {
 
     IPage<TrialSampleInfoVO> selectPage(IPage<TrialSampleInfo> page, TrialSampleInfoVO obj);
 
-    boolean sampleSubmit(TrialSampleInfo obj);
+    boolean sampleSubmit(TrialSampleInfoDTO obj);
 
     boolean sampleCopy(String ids);
 
@@ -23,4 +24,6 @@ public interface ITrialSampleInfoService extends BaseService<TrialSampleInfo> {
 
     void sampleExportPdf(String ids, HttpServletResponse response);
 
+    boolean sampleRelationMaterial(String id);
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/ITrialSamplingRecordService.java

@@ -0,0 +1,7 @@
+package org.springblade.business.service;
+
+import org.springblade.business.entity.TrialSamplingRecord;
+import org.springblade.core.mp.base.BaseService;
+
+public interface ITrialSamplingRecordService extends BaseService<TrialSamplingRecord> {
+}

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSampleInfoServiceImpl.java

@@ -2,6 +2,7 @@ package org.springblade.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.Font;
@@ -12,12 +13,18 @@ import com.lowagie.text.pdf.PdfWriter;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
+import org.springblade.business.dto.TrialSampleInfoDTO;
 import org.springblade.business.entity.TrialMaterialMobilization;
 import org.springblade.business.entity.TrialSampleInfo;
+import org.springblade.business.entity.TrialSamplingRecord;
 import org.springblade.business.excel.TrialMaterialMobilizationExcel;
 import org.springblade.business.excel.TrialSampleInfoExcel;
+import org.springblade.business.mapper.TrialMaterialMobilizationMapper;
 import org.springblade.business.mapper.TrialSampleInfoMapper;
+import org.springblade.business.mapper.TrialSamplingRecordMapper;
+import org.springblade.business.service.ITrialMaterialMobilizationService;
 import org.springblade.business.service.ITrialSampleInfoService;
+import org.springblade.business.service.ITrialSamplingRecordService;
 import org.springblade.business.utils.PDFUtil;
 import org.springblade.business.utils.SystemUtils;
 import org.springblade.business.vo.TrialSampleInfoVO;
@@ -48,6 +55,10 @@ import java.util.List;
 public class TrialSampleInfoServiceImpl extends BaseServiceImpl<TrialSampleInfoMapper, TrialSampleInfo> implements ITrialSampleInfoService {
 
     private final IUserClient iUserClient;
+    private final ITrialMaterialMobilizationService iTrialMaterialMobilizationService;
+    private final TrialMaterialMobilizationMapper trialMaterialMobilizationMapper;
+    private final ITrialSamplingRecordService iTrialSamplingRecordService;
+    private final TrialSamplingRecordMapper trialSamplingRecordMapper;
 
     @Override
     public TrialSampleInfo sampleDetail(Long id) {
@@ -74,12 +85,35 @@ public class TrialSampleInfoServiceImpl extends BaseServiceImpl<TrialSampleInfoM
     }
 
     @Override
-    public boolean sampleSubmit(TrialSampleInfo obj) {
+    public boolean sampleSubmit(TrialSampleInfoDTO obj) {
         if (ObjectUtil.isEmpty(SecureUtil.getUserId())) {
             throw new ServiceException("获取用户信息失败");
         }
         obj.setUserId(SecureUtil.getUserId());
-        return this.saveOrUpdate(obj);
+
+        this.saveOrUpdate(obj);
+
+        //新增或者修改成功后关联样品取样信息
+        if (obj.getId() != null && obj.getMobilizationId() != null) {
+            //获取当前选择的样品信息
+            TrialSamplingRecord trialSamplingRecord = trialSamplingRecordMapper.selectOne(Wrappers.<TrialSamplingRecord>query().lambda()
+                    .eq(TrialSamplingRecord::getMobilizationId, obj.getMobilizationId())
+                    .eq(TrialSamplingRecord::getSampleInfoId, obj.getId())
+            );
+            if (trialSamplingRecord != null) {
+                //存在不新增
+                return true;
+            } else {
+                //新增前删除旧记录
+                trialSamplingRecordMapper.delete(Wrappers.<TrialSamplingRecord>query().lambda().eq(TrialSamplingRecord::getSampleInfoId, obj.getId()));
+                //新增记录
+                TrialSamplingRecord record = new TrialSamplingRecord();
+                record.setMobilizationId(obj.getMobilizationId());
+                record.setSampleInfoId(obj.getId());
+                iTrialSamplingRecordService.save(record);
+            }
+        }
+        return true;
     }
 
     @Override
@@ -186,7 +220,7 @@ public class TrialSampleInfoServiceImpl extends BaseServiceImpl<TrialSampleInfoM
             document.add(tableTitle);
             document.add(new Paragraph("\n"));
 
-            String[] array = {"取样名称", "取样日期", "取样编号", "规格型号", "试样数量", "计算单位", "拟用部位", "代表数量","取样人"};
+            String[] array = {"取样名称", "取样日期", "取样编号", "规格型号", "试样数量", "计算单位", "拟用部位", "代表数量", "取样人"};
             for (String s : array) {
                 PDFUtil.createTableCell(s, textFont, table, lineHeight, colSpan);
             }
@@ -218,5 +252,10 @@ public class TrialSampleInfoServiceImpl extends BaseServiceImpl<TrialSampleInfoM
         }
     }
 
+    @Override
+    public boolean sampleRelationMaterial(String id) {
+        return false;
+    }
+
 
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSamplingRecordServiceImpl.java

@@ -0,0 +1,14 @@
+package org.springblade.business.service.impl;
+
+import lombok.AllArgsConstructor;
+import org.springblade.business.entity.TrialSamplingRecord;
+import org.springblade.business.mapper.TrialSamplingRecordMapper;
+import org.springblade.business.service.ITrialSamplingRecordService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class TrialSamplingRecordServiceImpl extends BaseServiceImpl<TrialSamplingRecordMapper, TrialSamplingRecord> implements ITrialSamplingRecordService {
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/TrialSummaryClassificationConfigurationController.java

@@ -1,13 +1,17 @@
 package org.springblade.manager.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.manager.entity.TrialSummaryClassificationConfiguration;
 import org.springblade.manager.service.ITrialSummaryClassificationConfigurationService;
+import org.springblade.manager.vo.ContractInfoVO;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -42,6 +46,13 @@ public class TrialSummaryClassificationConfigurationController extends BladeCont
         return R.status(iTrialSummaryClassificationConfigurationService.removeById(id));
     }
 
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "分页查询", notes = "")
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    public R<IPage<Object>> page(Query query, TrialSummaryClassificationConfiguration obj) {
+        IPage<Object> pages = iTrialSummaryClassificationConfigurationService.selectContractInfoPage(Condition.getPage(query), obj);
+        return R.data(pages);
+    }
 
 
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/TrialSummaryClassificationConfigurationMapper.java

@@ -1,7 +1,13 @@
 package org.springblade.manager.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.manager.entity.TrialSummaryClassificationConfiguration;
 
+import java.util.List;
+
 public interface TrialSummaryClassificationConfigurationMapper extends BaseMapper<TrialSummaryClassificationConfiguration> {
+
+    List<Object> selectContractInfoPage(IPage<Object> page, TrialSummaryClassificationConfiguration obj);
+
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/TrialSummaryClassificationConfigurationMapper.xml

@@ -16,4 +16,9 @@
         <result column="is_deleted" property="isDeleted"/>
     </resultMap>
 
+    <select id="selectContractInfoPage"
+            resultType="org.springblade.manager.entity.TrialSummaryClassificationConfiguration">
+        select * from m_trial_summary_classification_configuration where is_deleted = 0 and status =1
+    </select>
+
 </mapper>

blade-service/blade-manager/src/main/java/org/springblade/manager/service/ITrialSummaryClassificationConfigurationService.java

@@ -1,5 +1,6 @@
 package org.springblade.manager.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.manager.entity.TrialSummaryClassificationConfiguration;
 
@@ -8,4 +9,7 @@ public interface ITrialSummaryClassificationConfigurationService extends BaseSer
     TrialSummaryClassificationConfiguration detail(Long id);
 
     boolean submit(TrialSummaryClassificationConfiguration obj);
+
+    IPage<Object> selectContractInfoPage(IPage<Object> page, TrialSummaryClassificationConfiguration obj);
+
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/TrialSummaryClassificationConfigurationServiceImpl.java

@@ -1,5 +1,6 @@
 package org.springblade.manager.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.manager.entity.TrialSummaryClassificationConfiguration;
@@ -7,6 +8,8 @@ import org.springblade.manager.mapper.TrialSummaryClassificationConfigurationMap
 import org.springblade.manager.service.ITrialSummaryClassificationConfigurationService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @AllArgsConstructor
 public class TrialSummaryClassificationConfigurationServiceImpl
@@ -23,4 +26,10 @@ public class TrialSummaryClassificationConfigurationServiceImpl
         return this.saveOrUpdate(obj);
     }
 
+    @Override
+    public IPage<Object> selectContractInfoPage(IPage<Object> page, TrialSummaryClassificationConfiguration obj) {
+        List<Object> data = baseMapper.selectContractInfoPage(page, obj);
+        return page.setRecords(data);
+    }
+
 }