气瓶功能修改

zd-common/zd-common-core/pom.xml

@@ -126,6 +126,10 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
 
     </dependencies>
 

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/UsegasApply.java

@@ -65,7 +65,6 @@ public class UsegasApply extends BaseBean {
     private String safetyPrecautions;
 
     @ApiModelProperty("气体id")
-    @NotNull(message = "使用气体不能为空")
     private Long useGasId;
 
     @ApiModelProperty("气体名称")

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/UsegasApplyDetailVo.java

@@ -5,6 +5,7 @@ import com.zd.bottle.domain.UsegasAuditRecord;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 
@@ -20,7 +21,11 @@ public class UsegasApplyDetailVo {
     @ApiModelProperty(value = "使用气体")
     private String useGasName;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("期限开始")
+    private Date startTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("使用期限")
     private Date endTime;
 
@@ -33,6 +38,12 @@ public class UsegasApplyDetailVo {
     @ApiModelProperty("用气申请表")
     private String applyCertificate;
 
+    @ApiModelProperty("申请人")
+    private String applyUser;
+
+    @ApiModelProperty("联系方式")
+    private String phone;
+
     @ApiModelProperty("审核记录")
     private List<UsegasAuditRecord> details;
 
@@ -91,4 +102,28 @@ public class UsegasApplyDetailVo {
     public void setId(Long id) {
         this.id = id;
     }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getApplyUser() {
+        return applyUser;
+    }
+
+    public void setApplyUser(String applyUser) {
+        this.applyUser = applyUser;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/UsegasApplyController.java

@@ -10,6 +10,7 @@ import com.zd.bottle.vo.UsegasApplyTabVo;
 import com.zd.bottle.vo.UsegasApplyVo;
 import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.page.TableDataInfo;
@@ -107,7 +108,10 @@ public class UsegasApplyController extends BaseController<UsegasApply> {
         startPage();
         QueryWrapper<UsegasApply> wrapper = new QueryWrapper();
         wrapper.eq("user_id", SecurityUtils.getUserId());
-        wrapper.eq("lead_audit_staus", usegasApply.getLeadAuditStaus());
+        if(usegasApply.getLeadAuditStaus() != null){
+            wrapper.eq("lead_audit_staus", usegasApply.getLeadAuditStaus());
+        }
+        wrapper.orderByDesc("create_time");
         List<UsegasApply> list = usegasApplyService.list(wrapper);
         return getDataTable(list);
     }
@@ -115,14 +119,21 @@ public class UsegasApplyController extends BaseController<UsegasApply> {
     @ApiOperation(value = "个人提交申请")
     @PostMapping("/addByUser")
     public ResultData<UsegasApplyTabVo> addApplyByUser(@RequestBody @Valid UsegasApply usegasApply){
-        if(usegasApply.getUserId() == null || !usegasApply.getUserId().equals(SecurityUtils.getUserId())){
-            return ResultData.fail("参数异常！");
-        }
         SaveUtil.setCommonAttr(usegasApply);
         usegasApplyService.save(usegasApply);
         return ResultData.success();
     }
 
+    @ApiOperation(value = "个人重新申请")
+    @PostMapping("/updateByUser")
+    public ResultData<UsegasApplyTabVo> updateApplyByUser(@RequestBody @Valid UsegasApply usegasApply){
+        usegasApply.setUpdateBy(SecurityUtils.getUsername());
+        usegasApply.setUpdateTime(DateUtils.getNowDate());
+        usegasApply.setLeadAuditStaus((short) 0);
+        usegasApplyService.updateById(usegasApply);
+        return ResultData.success();
+    }
+
     @ApiOperation(value = "申请详情")
     @PostMapping("/detail")
     public ResultData<UsegasApplyDetailVo> queryApplyDetail(@RequestBody UsegasApply usegasApply){

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpStockServiceImpl.java

@@ -181,6 +181,10 @@ public class HxpStockServiceImpl implements IHxpStockService {
 
         logger.info("化学品入库，前端参数：" + JSONUtil.toJsonStr(hxpStock));
 
+        if(hxpStock.getOutUsages().compareTo(hxpStock.getTare()) < 0){
+            throw new ServiceException("入库重量错误，入库失败！");
+        }
+
         HxpClassifyConfig hxpClassifyConfig = hxpClassifyConfigMapper.selectHxpClassifyConfigById(hxpStock.getChemicalClassify());
 
         // 出于数据安全考虑，前端获取并回传的数据应该后端再校验一次，暂记录