土工平台修改

src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilAloneSampleController.java

@@ -164,6 +164,7 @@ public class SoilAloneSampleController extends ServiceController {
     })
     @PostMapping("/page_storehouse_sample")
     public RestResult<Page<SoilAloneSampleVO>> getPageStorehouseSample(SoilAloneSampleVO soilAloneSample) {
+        soilAloneSample.setStatus(SoilAloneStatusEnum.IN_STORAGE);
         return success(soilAloneSampleService.pageVO(getPage(), soilAloneSample));
     }
 
@@ -207,6 +208,14 @@ public class SoilAloneSampleController extends ServiceController {
     }
 
 
+    @ApiOperation("库房样品提交")
+    @PostMapping("/storage_sample_submit")
+    public RestResult<Boolean> storageSampleSubmit(@RequestParam("ids") Long [] ids) {
+        return success(soilAloneSampleService.storageSampleSubmit(ids,getAccount()));
+    }
+
+
+
 
     @ApiOperation("出库提交")
     @PostMapping("/out_storage_submit")

src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilAloneWarehouseLocationController.java

 package com.patzn.cloud.service.lims.soil.controller;
 
+import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.service.soil.entity.SoilAloneWarehouseLocation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -72,7 +74,10 @@ public class SoilAloneWarehouseLocationController extends ServiceController {
     @ApiOperation("添加")
     @PostMapping("/")
 	public RestResult<Boolean> add(SoilAloneWarehouseLocation soilAloneWarehouseLocation) {
-        return success(soilAloneWarehouseLocationService.save(soilAloneWarehouseLocation));
+
+
+
+      return success(soilAloneWarehouseLocationService.saveLocation(soilAloneWarehouseLocation));
 	}
 
     @ApiOperation("根据 ids 删除")

src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilEntrustController.java

@@ -45,9 +45,9 @@ public class SoilEntrustController extends ServiceController  {
             @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
     })
     @PostMapping("/page")
-	public RestResult<Page<SoilEntrust>> getPage(SoilEntrust soilEntrust) {
+	public RestResult<Page<SoilEntrustVO>> getPage(SoilEntrustVO soilEntrust) {
         soilEntrust.setStatus(SoilEntrustStatusEnum.DRAFT);
-        return success(soilEntrustService.page(getPage(), soilEntrust));
+        return success(soilEntrustService.pageVO(getPage(), soilEntrust));
 	}
 
 

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilAloneSampleService.java

@@ -32,4 +32,6 @@ public interface ISoilAloneSampleService extends IBaseService<SoilAloneSample> {
     boolean bathChangeStorehouse(Long[] ids, SoilAloneInOutStock aloneInOutStock, Account account);
 
     Page<SoilAloneSampleVO> pageVOSampleOfStorehouse(Page<SoilAloneSampleVO> page, SoilAloneSampleVO soilAloneSample);
+
+    boolean storageSampleSubmit(Long[] ids, Account account);
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilAloneWarehouseLocationService.java

@@ -17,4 +17,6 @@ public interface ISoilAloneWarehouseLocationService extends IBaseService<SoilAlo
     Page<SoilAloneWarehouseLocation> page(Page<SoilAloneWarehouseLocation> page, SoilAloneWarehouseLocation soilAloneWarehouseLocation);
 
     boolean removeByIds(List<Long> ids);
+
+    boolean saveLocation(SoilAloneWarehouseLocation soilAloneWarehouseLocation);
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilAloneSampleServiceImpl.java

@@ -104,8 +104,8 @@ public class SoilAloneSampleServiceImpl extends BaseServiceImpl<SoilAloneSampleM
         }
 
         SoilAloneSample soilAloneSample = new SoilAloneSample();
-        soilAloneSample.setStatus(SoilAloneStatusEnum.WAIT_DELIVERY);
-        soilAloneSample.setProgress(SoilAloneStatusEnum.WAIT_DELIVERY);
+        soilAloneSample.setStatus(SoilAloneStatusEnum.IN_STORAGE);
+        soilAloneSample.setProgress(SoilAloneStatusEnum.IN_STORAGE);
         if (super.update(soilAloneSample,Condition.create().in("id",ids))){
            return soilAloneInOutStockService.saveBatch(saveList);
         }
@@ -162,4 +162,14 @@ public class SoilAloneSampleServiceImpl extends BaseServiceImpl<SoilAloneSampleM
         RestAssert.fail(StringUtils.isBlank(soilAloneSample.getShelfCode()),"请选择架货号");
         return page.setRecords(baseMapper.selectVOSampleOfStorehouseList(page,soilAloneSample));
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean storageSampleSubmit(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请填写要提交的样品！");
+        SoilAloneSample sample = new SoilAloneSample();
+        sample.setStatus(SoilAloneStatusEnum.WAIT_DELIVERY);
+        sample.setProgress(SoilAloneStatusEnum.WAIT_DELIVERY);
+        return super.update(sample,Condition.create().in("id",ids));
+    }
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilAloneWarehouseLocationServiceImpl.java

 package com.patzn.cloud.service.lims.soil.service.impl;
 
 import com.baomidou.mybatisplus.mapper.Condition;
+import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.service.lims.soil.mapper.SoilAloneWarehouseLocationMapper;
 import com.patzn.cloud.service.lims.soil.service.ISoilAloneWarehouseLocationService;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import com.patzn.cloud.service.soil.entity.SoilAloneWarehouseLocation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -32,4 +34,15 @@ public class SoilAloneWarehouseLocationServiceImpl extends BaseServiceImpl<SoilA
     public boolean removeByIds(List<Long> ids) {
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public boolean saveLocation(SoilAloneWarehouseLocation soilAloneWarehouseLocation) {
+        RestAssert.fail(StringUtils.isBlank(soilAloneWarehouseLocation.getName()),"货架号不能为空");
+        RestAssert.fail(StringUtils.isBlank(soilAloneWarehouseLocation.getWarehouse()),"库房不能为空");
+        int count = super.count(Condition.create().eq("name",soilAloneWarehouseLocation.getName()).eq("warehouse",soilAloneWarehouseLocation.getWarehouse()));
+        if (count>0){
+            RestAssert.fail("位置重复");
+        }
+        return save(soilAloneWarehouseLocation);
+    }
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilEntrustServiceImpl.java

@@ -154,6 +154,8 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean saveEntrustDTO(SoilEntrustDTO dto, Account account) {
+
+        RestAssert.fail(StringUtils.isBlank(dto.getClient()),"委托单位不能为空！");
         SoilEntrust soilEntrust = dto.convert(SoilEntrust.class);
         soilEntrust.setStatus(SoilEntrustStatusEnum.DRAFT);
         soilEntrust.setProgress(SoilEntrustStatusEnum.DRAFT);
@@ -466,7 +468,24 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
 
     @Override
     public Page<SoilEntrustVO> pageVO(Page<SoilEntrustVO> page, SoilEntrustVO soilEntrust) {
-        return page.setRecords(baseMapper.selectVOList(page,soilEntrust));
+        List<SoilEntrustVO> voList = baseMapper.selectVOList(page,soilEntrust);
+        if (CollectionUtils.isEmpty(voList)){
+            return page;
+        }
+        List<Long> sampleIdsList = voList.stream().map(s->{
+            return s.getId();
+        }).collect(Collectors.toList());
+
+        List<SoilEntrustRecord> recordList = soilEntrustRecordService.list(Condition.create().eq("target",SoilEntrustStatusEnum.DRAFT.getDisplay()).in("entrust_id",sampleIdsList).eq("type",1).orderBy("ctime",false));
+        for (SoilEntrustVO vo:voList) {
+            for (SoilEntrustRecord record:recordList) {
+                if (record.getEntrustId().equals(vo.getId())){
+                    vo.setBackReasons(record.getRemark());
+                    break;
+                }
+            }
+        }
+        return page.setRecords(voList);
     }
 
 

src/main/resources/mapper/soil/SoilAloneSampleMapper.xml

@@ -15,6 +15,11 @@
             <if test="vo.boreholeName">
                 AND s.borehole_name LIKE CONCAT('%',#{vo.boreholeName},'%')
             </if>
+
+            <if test="vo.status">
+                AND s.status = #{vo.status}
+            </if>
+
             <if test="vo.storehouse">
                 AND o.storehouse LIKE CONCAT('%',#{vo.storehouse},'%')
             </if>

src/main/resources/mapper/soil/SoilEntrustMapper.xml

@@ -10,6 +10,7 @@
     e.id,
     e.client,
     e.project_no,
+    e.project_leader,
     e.borehole_name,
     e.borehole_location,
     e.water_depth,

src/test/java/resources/db_sql/v1.1.3/修改字段.sql

+ALTER TABLE "public"."soil_alone_sample" 
+ALTER TABLE "public"."soil_alone_sample" 
+  ALTER COLUMN "cases_num" TYPE varchar(16) USING "cases_num"::varchar(100);
+
+
+
+  ALTER TABLE "public"."soil_entrust"
+  ADD COLUMN "project_leader" varchar(100),
+  ADD COLUMN "project_leader_id" int8;
+
+COMMENT ON COLUMN "public"."soil_entrust"."project_leader" IS '项目负责人';
+
+COMMENT ON COLUMN "public"."soil_entrust"."project_leader_id" IS '项目负责人ID';
\ No newline at end of file

src/test/java/resources/仪器管理修改字段长度.sql

-ALTER TABLE "public"."lms_equip_info"
-ALTER TABLE "public"."lms_equip_info"
-  ALTER COLUMN "uncertainty" TYPE text COLLATE "pg_catalog"."default" USING "uncertainty"::text;
-
-	ALTER TABLE "public"."lms_equip_info"
-  ALTER COLUMN "range" TYPE text COLLATE "pg_catalog"."default" USING "range"::text;
-
-
-
+++ /dev/null