土工平台修改

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ContractSampleController.java

@@ -48,6 +48,7 @@ public class ContractSampleController extends ServiceController {
     })
     @PostMapping("/page")
 	public RestResult<Page<ContractSample>> getPage(ContractSample contractSample) {
+        contractSample.setStatus(ContractSampleStatusEnum.DRAFT);
         return success(contractSampleService.page(getPage(), contractSample));
 	}
 
@@ -67,6 +68,49 @@ public class ContractSampleController extends ServiceController {
     }
 
 
+    @ApiOperation("储运登记分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_pro_tech_check")
+    public RestResult<Page<ContractSample>> getPageProTechCheck(ContractSample contractSample) {
+        contractSample.setStatus(ContractSampleStatusEnum.PRO_TEC_CHECK);
+        return success(contractSampleService.page(getPage(), contractSample));
+    }
+
+
+    @ApiOperation("验收任务登记登记分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_check_accept_reg")
+    public RestResult<Page<ContractSample>> getPageCheckAcceptReg(ContractSample contractSample) {
+        contractSample.setStatus(ContractSampleStatusEnum.CHECK_ACCEPT_REG);
+        return success(contractSampleService.page(getPage(), contractSample));
+    }
+
+
+
+    @ApiOperation("验收组织分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_check_accept_org")
+    public RestResult<Page<ContractSample>> getPageCheckAcceptOrg(ContractSample contractSample) {
+        contractSample.setStatus(ContractSampleStatusEnum.CHECK_ACCEPT_ORg);
+        return success(contractSampleService.page(getPage(), contractSample));
+    }
+
+
 
 
     @ApiOperation("根据ID查询列表分页列表")
@@ -119,6 +163,36 @@ public class ContractSampleController extends ServiceController {
 
 
 
+    @ApiOperation("提交至验收任务登记")
+    @PostMapping("/submit_to_check_accept_reg")
+    public RestResult<Boolean> submitToCheckAcceptReg(@RequestParam("ids") Long [] ids) {
+        return success(contractSampleService.submitToCheckAcceptReg(ids,getAccount()));
+    }
+
+
+
+    @ApiOperation("验收任务登记提交至验收组织")
+    @PostMapping("/submit_to_check_accept_org")
+    public RestResult<Boolean> submitToCheckAcceptOrg(@RequestParam("ids") Long [] ids) {
+        return success(contractSampleService.submitToCheckAcceptOrg(ids,getAccount()));
+    }
+
+
+    @ApiOperation("提交至生技部审核")
+    @PostMapping("/submit_to_pro_tech_check")
+    public RestResult<Boolean> submitToProTechCheck(@RequestParam("ids") Long [] ids) {
+        return success(contractSampleService.submitToProTechCheck(ids,getAccount()));
+    }
+
+
+    @ApiOperation("生技部审核退回")
+    @PostMapping("/back_pro_tech_check")
+    public RestResult<Boolean> backProTechCheck(@RequestParam("ids") Long [] ids,@RequestParam("reason") String reason) {
+        return success(contractSampleService.backProTechCheck(ids,reason,getAccount()));
+    }
+
+
+
     @ApiOperation("根据 ids 删除")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ContractSampleRecordController.java

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.patzn.cloud.service.hmhj.entity.ContractSampleRecord;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.api.RestConstants;
+import com.patzn.cloud.commons.api.RestResult;
+import com.patzn.cloud.commons.controller.ServiceController;
+import com.patzn.cloud.service.lims.hmhj.service.IContractSampleRecordService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * 合同样品操作日志 前端控制器
+ *
+ * @author wwd
+ * @since 2021-02-05
+ */
+@Api(tags = "合同样品操作日志")
+@RestController
+@RequestMapping("/v1/sample_record")
+public class ContractSampleRecordController extends ServiceController {
+
+    @Autowired
+    private IContractSampleRecordService contractSampleRecordService;
+
+    @ApiOperation("分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page")
+	public RestResult<Page<ContractSampleRecord>> getPage(ContractSampleRecord contractSampleRecord) {
+        return success(contractSampleRecordService.page(getPage(), contractSampleRecord));
+	}
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<ContractSampleRecord> get(@PathVariable("id") Long id) {
+        return success(contractSampleRecordService.getById(id));
+    }
+
+    @ApiOperation("根据 id 修改信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @PutMapping("/{id}")
+	public RestResult<Boolean> edit(@PathVariable("id") Long id, ContractSampleRecord contractSampleRecord) {
+        contractSampleRecord.setId(id);
+        return success(contractSampleRecordService.updateById(contractSampleRecord));
+	}
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+	public RestResult<Boolean> add(ContractSampleRecord contractSampleRecord) {
+        return success(contractSampleRecordService.save(contractSampleRecord));
+	}
+
+    @ApiOperation("根据 ids 删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
+    })
+	@DeleteMapping("/")
+	public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
+        return success(contractSampleRecordService.removeByIds(ids));
+	}
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/ContractSampleRecordMapper.java

+package com.patzn.cloud.service.lims.hmhj.mapper;
+
+import com.patzn.cloud.commons.mapper.BatchMapper;
+import com.patzn.cloud.service.hmhj.entity.ContractSampleRecord;
+
+/**
+ * <p>
+ * 合同样品操作日志 Mapper 接口
+ * </p>
+ *
+ * @author wwd
+ * @since 2021-02-05
+ */
+public interface ContractSampleRecordMapper extends BatchMapper<ContractSampleRecord> {
+
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IContractSampleRecordService.java

+package com.patzn.cloud.service.lims.hmhj.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.controller.Account;
+import com.patzn.cloud.commons.service.IBaseService;
+import com.patzn.cloud.service.hmhj.entity.ContractSampleRecord;
+import com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum;
+
+import java.util.List;
+
+/**
+ * 合同样品操作日志 服务类
+ *
+ * @author wwd
+ * @since 2021-02-05
+ */
+public interface IContractSampleRecordService extends IBaseService<ContractSampleRecord> {
+
+    Page<ContractSampleRecord> page(Page<ContractSampleRecord> page, ContractSampleRecord contractSampleRecord);
+
+    boolean removeByIds(List<Long> ids);
+
+    void record(Long[] ids, ContractSampleStatusEnum proTecCheck, ContractSampleStatusEnum storeTransport, int i, String reason, Account account);
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IContractSampleService.java

@@ -22,4 +22,12 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
     boolean removeByIds(List<Long> ids);
 
     boolean submitToStoreTransport(Long[] ids, Account account);
+
+    boolean submitToProTechCheck(Long[] ids, Account account);
+
+    boolean backProTechCheck(Long[] ids, String reason, Account account);
+
+    boolean submitToCheckAcceptReg(Long[] ids, Account account);
+
+    boolean submitToCheckAcceptOrg(Long[] ids, Account account);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ContractSampleRecordServiceImpl.java

+package com.patzn.cloud.service.lims.hmhj.service.impl;
+
+import com.baomidou.mybatisplus.mapper.Condition;
+import com.baomidou.mybatisplus.toolkit.CollectionUtils;
+import com.patzn.cloud.commons.controller.Account;
+import com.patzn.cloud.service.hmhj.entity.ContractSampleRecord;
+import com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum;
+import com.patzn.cloud.service.lims.hmhj.mapper.ContractSampleRecordMapper;
+import com.patzn.cloud.service.lims.hmhj.service.IContractSampleRecordService;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 合同样品操作日志 服务实现类
+ *
+ * @author wwd
+ * @since 2021-02-05
+ */
+@Service
+public class ContractSampleRecordServiceImpl extends BaseServiceImpl<ContractSampleRecordMapper, ContractSampleRecord> implements IContractSampleRecordService {
+
+    @Override
+    public Page<ContractSampleRecord> page(Page<ContractSampleRecord> page, ContractSampleRecord contractSampleRecord) {
+        Wrapper wrapper = new EntityWrapper<>(contractSampleRecord);
+
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public boolean removeByIds(List<Long> ids) {
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    @Override
+    public void record(Long[] ids, ContractSampleStatusEnum from, ContractSampleStatusEnum to, int type, String reason, Account account) {
+        List<ContractSampleRecord> saveRecordList = new ArrayList<>();
+        for (Long id:ids) {
+            ContractSampleRecord record = new ContractSampleRecord();
+            record.setContractSampleId(id);
+            record.setOperator(account.getUserName());
+            record.setOperatorId(account.getUserId());
+            record.setOrigin(from.getDisplay());
+            record.setTarget(to.getDisplay());
+            record.setType(type);
+            record.setRemark(reason);
+            saveRecordList.add(record);
+        }
+        if (CollectionUtils.isNotEmpty(saveRecordList)){
+            saveBatch(saveRecordList);
+        }
+    }
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ContractSampleServiceImpl.java

@@ -5,10 +5,14 @@ import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.service.hmhj.entity.ContractSample;
 import com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum;
+import com.patzn.cloud.service.lims.common.service.ILmsMsgService;
 import com.patzn.cloud.service.lims.hmhj.mapper.ContractSampleMapper;
+import com.patzn.cloud.service.lims.hmhj.service.IContractSampleRecordService;
 import com.patzn.cloud.service.lims.hmhj.service.IContractSampleService;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -26,6 +30,13 @@ import java.util.List;
 @Service
 public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMapper, ContractSample> implements IContractSampleService {
 
+
+    @Autowired
+    private IContractSampleRecordService contractSampleRecordService;
+
+    @Autowired
+    private ILmsMsgService lmsMsgService;
+
     @Override
     public Page<ContractSample> page(Page<ContractSample> page, ContractSample contractSample) {
         Wrapper wrapper = new EntityWrapper<>(contractSample);
@@ -55,4 +66,61 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
         contractSample.setProgress(ContractSampleStatusEnum.STORE_TRANSPORT);
         return super.update(contractSample,Condition.create().in("id",ids));
     }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean submitToProTechCheck(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的合同！");
+        ContractSample contractSample = new ContractSample();
+        contractSample.setStatus(ContractSampleStatusEnum.PRO_TEC_CHECK);
+        contractSample.setProgress(ContractSampleStatusEnum.PRO_TEC_CHECK);
+        return super.update(contractSample,Condition.create().in("id",ids));
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean backProTechCheck(Long[] ids, String reason, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的合同！");
+        RestAssert.fail(StringUtils.isBlank(reason),"请填写退回原因！");
+
+        ContractSample contractSample = new ContractSample();
+        contractSample.setStatus(ContractSampleStatusEnum.STORE_TRANSPORT);
+        contractSample.setProgress(ContractSampleStatusEnum.BACK_PRO_TEC_CHECK);
+
+        contractSampleRecordService.record(ids,ContractSampleStatusEnum.PRO_TEC_CHECK,ContractSampleStatusEnum.STORE_TRANSPORT,1,reason,account);
+        lmsMsgService.sendMsg("/hmhj/contract_manage/storage_register","有合同从生技部退回，请及时处理","新的生技部退回任务！",account,null);
+        return super.update(contractSample,Condition.create().in("id",ids));
+    }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean submitToCheckAcceptReg(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的合同！");
+        ContractSample contractSample = new ContractSample();
+        contractSample.setStatus(ContractSampleStatusEnum.CHECK_ACCEPT_REG);
+        contractSample.setProgress(ContractSampleStatusEnum.CHECK_ACCEPT_REG);
+        contractSampleRecordService.record(ids,ContractSampleStatusEnum.STORE_TRANSPORT,ContractSampleStatusEnum.CHECK_ACCEPT_REG,0,"提交至验收任务登记",account);
+        lmsMsgService.sendMsg("/hmhj/accept_manage/accept_register","有合同从储运任务提交过来，请及时处理","新的验收任务登记任务！",account,null);
+        return super.update(contractSample,Condition.create().in("id",ids));
+
+    }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean submitToCheckAcceptOrg(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的合同！");
+        ContractSample contractSample = new ContractSample();
+        contractSample.setStatus(ContractSampleStatusEnum.CHECK_ACCEPT_ORg);
+        contractSample.setProgress(ContractSampleStatusEnum.CHECK_ACCEPT_ORg);
+        contractSampleRecordService.record(ids,ContractSampleStatusEnum.CHECK_ACCEPT_REG,ContractSampleStatusEnum.CHECK_ACCEPT_ORg,0,"验收任务登记提交至验收组织",account);
+        lmsMsgService.sendMsg("/hmhj/accept_manage/accept_organization","验收任务由验收任务登记提交过来，请及时处理","新的验收组织任务！",account,null);
+        return super.update(contractSample,Condition.create().in("id",ids));
+    }
+
+
+
+
 }

src/main/resources/mapper/hmhj/ContractSampleRecordMapper.xml

+<?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="com.patzn.cloud.service.lims.hmhj.mapper.ContractSampleRecordMapper">
+
+</mapper>