Merge remote-tracking branch 'origin/dev' into dev

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/ActHxpapplyController.java

@@ -3,6 +3,7 @@ package com.zd.chemical.controller;
 import com.zd.chemical.domain.ActHxpapply;
 import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.service.IActHxpapplyService;
+import com.zd.chemical.util.ChemicalUtils;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.log.BusinessType;
@@ -34,22 +35,26 @@ import java.util.Optional;
 @RestController
 @Api(tags = "【化学品申购】")
 @RequestMapping("/hxpapply")
-public class ActHxpapplyController extends BaseController<ActHxpapply>
-{
+public class ActHxpapplyController extends BaseController<ActHxpapply> {
     @Autowired
     private IActHxpapplyService actHxpapplyService;
 
     /**
      * 查询化学品申购列表
      */
-    @PreAuthorize(hasPermi = PerPrefix.ACT_HXP_APPLY+ PerFun.LIST)
+    @PreAuthorize(hasPermi = PerPrefix.ACT_HXP_APPLY + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询化学品申购列表")
-    public TableDataInfo<ActHxpapplyListVo> list(ActHxpapplySearch actHxpapplySearch)
-    {
+    public TableDataInfo<ActHxpapplyListVo> list(ActHxpapplySearch actHxpapplySearch) {
         startPage();
         List<ActHxpapplyListVo> list = actHxpapplyService.selectActHxpapplyList(actHxpapplySearch);
-        TableDataInfo<ActHxpapplyListVo> info=new TableDataInfo<>();
+        //去除小数点后多余的0
+        if (list != null && list.size() > 0) {
+            list.stream().forEach(vo -> {
+                vo.setChemicalNames(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalNames()));
+            });
+        }
+        TableDataInfo<ActHxpapplyListVo> info = new TableDataInfo<>();
         info.getDataTable(list);
         return info;
     }
@@ -58,15 +63,20 @@ public class ActHxpapplyController extends BaseController<ActHxpapply>
     /**
      * 查询化学品申购列表(草稿箱)
      */
-    @PreAuthorize(hasPermi = PerPrefix.ACT_HXP_APPLY+ PerFun.DRAFTSLIST)
+    @PreAuthorize(hasPermi = PerPrefix.ACT_HXP_APPLY + PerFun.DRAFTSLIST)
     @GetMapping("/draftsList")
     @ApiOperation(value = "查询化学品申购列表(草稿箱)")
-    public TableDataInfo<ActHxpapplyDraftsListVo> draftsList(ActHxpapplySearch actHxpapplySearch)
-    {
+    public TableDataInfo<ActHxpapplyDraftsListVo> draftsList(ActHxpapplySearch actHxpapplySearch) {
         actHxpapplySearch.setUserId(SecurityUtils.getUserId());
         startPage();
         List<ActHxpapplyDraftsListVo> list = actHxpapplyService.draftsList(actHxpapplySearch);
-        TableDataInfo<ActHxpapplyDraftsListVo> info=new TableDataInfo<>();
+        //去除小数点后多余的0
+        if (list != null && list.size() > 0) {
+            list.stream().forEach(vo -> {
+                vo.setChemicalNames(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalNames()));
+            });
+        }
+        TableDataInfo<ActHxpapplyDraftsListVo> info = new TableDataInfo<>();
         info.getDataTable(list);
         return info;
     }
@@ -77,12 +87,17 @@ public class ActHxpapplyController extends BaseController<ActHxpapply>
      */
     @GetMapping("/myList")
     @ApiOperation(value = "查询化学品申购列表")
-    public TableDataInfo<ActHxpapplyListVo> mylist(ActHxpapplySearch actHxpapplySearch)
-    {
+    public TableDataInfo<ActHxpapplyListVo> mylist(ActHxpapplySearch actHxpapplySearch) {
         startPage();
         actHxpapplySearch.setUserId(SecurityUtils.getUserId());
         List<ActHxpapplyListVo> list = actHxpapplyService.selectActHxpapplyList(actHxpapplySearch);
-        TableDataInfo<ActHxpapplyListVo> info=new TableDataInfo<>();
+        //去除小数点后多余的0
+        if (list != null && list.size() > 0) {
+            list.stream().forEach(vo -> {
+                vo.setChemicalNames(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalNames()));
+            });
+        }
+        TableDataInfo<ActHxpapplyListVo> info = new TableDataInfo<>();
         info.getDataTable(list);
         return info;
     }
@@ -93,12 +108,11 @@ public class ActHxpapplyController extends BaseController<ActHxpapply>
      */
     @GetMapping("/myDraftsList")
     @ApiOperation(value = "查询化学品申购列表(草稿箱)")
-    public TableDataInfo<ActHxpapplyDraftsListVo> myDraftsList(ActHxpapplySearch actHxpapplySearch)
-    {
+    public TableDataInfo<ActHxpapplyDraftsListVo> myDraftsList(ActHxpapplySearch actHxpapplySearch) {
         startPage();
         actHxpapplySearch.setUserId(SecurityUtils.getUserId());
         List<ActHxpapplyDraftsListVo> list = actHxpapplyService.draftsList(actHxpapplySearch);
-        TableDataInfo<ActHxpapplyDraftsListVo> info=new TableDataInfo<>();
+        TableDataInfo<ActHxpapplyDraftsListVo> info = new TableDataInfo<>();
         info.getDataTable(list);
         return info;
     }
@@ -107,34 +121,33 @@ public class ActHxpapplyController extends BaseController<ActHxpapply>
      * 导出化学品申购列表
      */
     @ApiOperation(value = "导出化学品申购列表")
-    @PreAuthorize(hasPermi = PerPrefix.ACT_HXP_APPLY+ PerFun.EXPORT)
+    @PreAuthorize(hasPermi = PerPrefix.ACT_HXP_APPLY + PerFun.EXPORT)
     @Log(title = "化学品申购", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ActHxpapplySearch actHxpapplySearch) throws IOException
-    {
+    public void export(HttpServletResponse response, ActHxpapplySearch actHxpapplySearch) throws IOException {
         List<ActHxpapplyListVo> list = actHxpapplyService.selectActHxpapplyList(actHxpapplySearch);
         Optional.ofNullable(list).orElseGet(Collections::emptyList)
                 .stream()
-                .forEach(a->{
+                .forEach(a -> {
                     StringBuffer currentApprover = new StringBuffer();
                     Optional.ofNullable(a.getCurrentUserList()).orElseGet(Collections::emptyList)
                             .stream()
-                            .forEach(b->{
+                            .forEach(b -> {
                                 currentApprover.append(",");
                                 currentApprover.append(b.get("name"));
                             });
-                    if(currentApprover.length()>0){
+                    if (currentApprover.length() > 0) {
                         a.setCurrentApprover(currentApprover.substring(1));
                     }
 
                     StringBuffer historyApprover = new StringBuffer();
                     Optional.ofNullable(a.getHistoryUserList()).orElseGet(Collections::emptyList)
                             .stream()
-                            .forEach(b->{
+                            .forEach(b -> {
                                 historyApprover.append(",");
                                 historyApprover.append(b.get("name"));
                             });
-                    if(historyApprover.length()>0){
+                    if (historyApprover.length() > 0) {
                         a.setHistoryApprover(historyApprover.substring(1));
                     }
                 });
@@ -146,22 +159,31 @@ public class ActHxpapplyController extends BaseController<ActHxpapply>
      * 获取化学品申购详细信息
      */
     @ApiOperation(value = "获取化学品申购详细信息")
-    @PreAuthorize(hasPermi = PerPrefix.ACT_HXP_APPLY+ PerFun.QUERY)
+    @PreAuthorize(hasPermi = PerPrefix.ACT_HXP_APPLY + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public ResultData<ActHxpapplyInfoVo> getInfo(@PathVariable("id") Long id)
-    {
-        return ResultData.success(actHxpapplyService.selectActHxpapplyById(id,2));
+    public ResultData<ActHxpapplyInfoVo> getInfo(@PathVariable("id") Long id) {
+        ActHxpapplyInfoVo vo = actHxpapplyService.selectActHxpapplyById(id, 2);
+        //去除无效小数点
+        if (vo != null) {
+            List <ActHxpapplyDetailVo> list = vo.getActHxpapplyDetailList();
+            if (list != null && list.size() > 0) {
+                list.stream().forEach(detailVo -> {
+                    detailVo.setApplyNum(ChemicalUtils.removeZeroForAfterPoint(detailVo.getApplyNum()));
+                    detailVo.setRemainingStorage(ChemicalUtils.removeZeroForAfterPoint(detailVo.getRemainingStorage()));
+                });
+            }
+        }
+        return ResultData.success(vo);
     }
 
     /**
      * 获取化学品申购详细信息(审批记录调用)
      */
     @ApiOperation(value = "获取化学品申购详细信息")
-    @PreAuthorize(hasPermi = PerPrefix.ACT_HXP_APPLYAUDIT+ PerFun.QUERY)
+    @PreAuthorize(hasPermi = PerPrefix.ACT_HXP_APPLYAUDIT + PerFun.QUERY)
     @GetMapping(value = "/audit/{id}")
-    public ResultData<ActHxpapplyInfoVo> auditByGetInfo(@PathVariable("id") Long id)
-    {
-        return ResultData.success(actHxpapplyService.selectActHxpapplyById(id,1));
+    public ResultData<ActHxpapplyInfoVo> auditByGetInfo(@PathVariable("id") Long id) {
+        return ResultData.success(actHxpapplyService.selectActHxpapplyById(id, 1));
     }
 
     /**
@@ -169,9 +191,8 @@ public class ActHxpapplyController extends BaseController<ActHxpapply>
      */
     @ApiOperation(value = "获取化学品申购详细信息(学生端接口)")
     @GetMapping(value = "/myInfo/{id}")
-    public ResultData<ActHxpapplyInfoVo> getMyInfo(@PathVariable("id") Long id)
-    {
-        return ResultData.success(actHxpapplyService.selectActHxpapplyById(id,2));
+    public ResultData<ActHxpapplyInfoVo> getMyInfo(@PathVariable("id") Long id) {
+        return ResultData.success(actHxpapplyService.selectActHxpapplyById(id, 2));
     }
 
 
@@ -179,11 +200,10 @@ public class ActHxpapplyController extends BaseController<ActHxpapply>
      * 新增化学品申购
      */
     @ApiOperation(value = "新增化学品申购")
-    @PreAuthorize(hasPermi = PerPrefix.ACT_HXP_APPLY+ PerFun.ADD)
+    @PreAuthorize(hasPermi = PerPrefix.ACT_HXP_APPLY + PerFun.ADD)
     @Log(title = "化学品申购", businessType = BusinessType.INSERT)
     @PostMapping
-    public ResultData add(@RequestBody ActHxpapplyVo actHxpapplyVo)
-    {
+    public ResultData add(@RequestBody ActHxpapplyVo actHxpapplyVo) {
         return ResultData.result(actHxpapplyService.insertActHxpapply(actHxpapplyVo));
     }
 
@@ -193,8 +213,7 @@ public class ActHxpapplyController extends BaseController<ActHxpapply>
     @ApiOperation(value = "新增化学品申购(学生端接口)")
     @Log(title = "化学品申购", businessType = BusinessType.INSERT)
     @PostMapping("/myadd")
-    public ResultData myadd(@RequestBody ActHxpapplyVo actHxpapplyVo)
-    {
+    public ResultData myadd(@RequestBody ActHxpapplyVo actHxpapplyVo) {
         return ResultData.result(actHxpapplyService.insertActHxpapply(actHxpapplyVo));
     }
 
@@ -205,20 +224,18 @@ public class ActHxpapplyController extends BaseController<ActHxpapply>
 //    @PreAuthorize(hasPermi = "laboratory:hxpapply:edit")
     @Log(title = "化学品申购", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData edit(@RequestBody ActHxpapply actHxpapply)
-    {
-        return  ResultData.result(actHxpapplyService.updateActHxpapply(actHxpapply));
+    public ResultData edit(@RequestBody ActHxpapply actHxpapply) {
+        return ResultData.result(actHxpapplyService.updateActHxpapply(actHxpapply));
     }
 
     /**
      * 删除化学品申购
      */
     @ApiOperation(value = "删除化学品申购")
-    @PreAuthorize(hasPermi = PerPrefix.ACT_HXP_APPLY+ PerFun.REMOVE)
+    @PreAuthorize(hasPermi = PerPrefix.ACT_HXP_APPLY + PerFun.REMOVE)
     @Log(title = "化学品申购", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public ResultData remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public ResultData remove(@PathVariable Long[] ids) {
         return ResultData.result(actHxpapplyService.deleteActHxpapplyByIds(ids));
     }
 
@@ -229,8 +246,7 @@ public class ActHxpapplyController extends BaseController<ActHxpapply>
     @ApiOperation(value = "删除化学品申购(学生端接口)")
     @Log(title = "化学品申购", businessType = BusinessType.DELETE)
     @DeleteMapping("/myDel/{ids}")
-    public ResultData myDel(@PathVariable Long[] ids)
-    {
+    public ResultData myDel(@PathVariable Long[] ids) {
         return ResultData.result(actHxpapplyService.deleteActHxpapplyByIds(ids));
     }
 
@@ -240,8 +256,7 @@ public class ActHxpapplyController extends BaseController<ActHxpapply>
      */
     @ApiOperation(value = "获取化学品剩余可存放量")
     @GetMapping(value = "/getRestStock")
-    public ResultData<Map <String, String>> getRestStock(ActRestStockVo actRestStockVo)
-    {
+    public ResultData<Map<String, String>> getRestStock(ActRestStockVo actRestStockVo) {
         return ResultData.success(actHxpapplyService.getRestStock(actRestStockVo));
     }
 
@@ -251,8 +266,14 @@ public class ActHxpapplyController extends BaseController<ActHxpapply>
      */
     @ApiOperation(value = "获取化学品剩余可存放量")
     @GetMapping(value = "/getRestStockByManyCabinet")
-    public ResultData<List<ActRestStockManyVo>> getRestStockByManyCabinet(ActRestStockManySearch actRestStockVo)
-    {
-        return ResultData.success(actHxpapplyService.getRestStockByManyCabinet(actRestStockVo));
+    public ResultData<List<ActRestStockManyVo>> getRestStockByManyCabinet(ActRestStockManySearch actRestStockVo) {
+        List<ActRestStockManyVo> list = actHxpapplyService.getRestStockByManyCabinet(actRestStockVo);
+        //去除小数点后多余的0
+        if (list != null && list.size() > 0) {
+            list.stream().forEach(vo -> {
+                vo.setRestStock(ChemicalUtils.removeZeroForAfterPoint(vo.getRestStock()));
+            });
+        }
+        return ResultData.success(list);
     }
 }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpCabinetController.java

@@ -1,10 +1,12 @@
 package com.zd.chemical.controller;
 
 import com.zd.chemical.domain.HxpCabinet;
+import com.zd.chemical.domain.vo.HxpCabinetInclusionChemicalSon;
 import com.zd.chemical.domain.vo.HxpCabinetInclusionChemicalVo;
 import com.zd.chemical.domain.vo.HxpCabinetSearch;
 import com.zd.chemical.domain.vo.HxpCabinetVo;
 import com.zd.chemical.service.IHxpCabinetService;
+import com.zd.chemical.util.ChemicalUtils;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.exception.ServiceException;
@@ -136,6 +138,19 @@ public class HxpCabinetController extends BaseController {
     public TableDataInfo<HxpCabinetInclusionChemicalVo> getCabinetByChemical(HxpCabinetSearch hxpCabinetSearch) {
         startPage();
         List<HxpCabinetInclusionChemicalVo> list = hxpCabinetService.getCabinetByChemical(hxpCabinetSearch);
+        //去除小数点后多余的0
+        if (list != null && list.size() > 0) {
+            list.stream().forEach(vo -> {
+                vo.setTotalStock(ChemicalUtils.removeZeroForAfterPoint(vo.getTotalStock()));
+                List <HxpCabinetInclusionChemicalSon> voList = vo.getHxpCabinetInclusionChemicalSonList();
+                if (voList != null && voList.size() > 0) {
+                    voList.stream().forEach(son -> {
+                        son.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(son.getChemicalAmountUnit()));
+                        son.setOutUsages(ChemicalUtils.removeZeroForAfterPoint(son.getOutUsages()));
+                    });
+                }
+            });
+        }
         return getDataTable(list);
     }
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpChemicalJoinCabinetController.java

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.zd.chemical.domain.vo.HxpChemicalJoinCabinetListVo;
 import com.zd.chemical.domain.vo.HxpChemicalJoinCabinetSearch;
 import com.zd.chemical.domain.vo.HxpChemicalJoinCabinetVo;
+import com.zd.chemical.util.ChemicalUtils;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.utils.SecurityUtils;
@@ -54,6 +55,13 @@ public class HxpChemicalJoinCabinetController extends BaseController {
     public TableDataInfo<HxpChemicalJoinCabinetListVo> list(HxpChemicalJoinCabinetSearch hxpChemicalJoinCabinetSearch) {
         startPage();
         List<HxpChemicalJoinCabinetListVo> list = hxpChemicalJoinCabinetService.selectHxpChemicalJoinCabinetList(hxpChemicalJoinCabinetSearch);
+        //去除多余的0
+        if (list != null && list.size() > 0) {
+            list.stream().forEach(vo -> {
+                vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
+                vo.setTare(ChemicalUtils.removeZeroForAfterPoint(vo.getTare()));
+            });
+        }
         return getDataTable(list);
     }
 
@@ -63,6 +71,13 @@ public class HxpChemicalJoinCabinetController extends BaseController {
         startPage();
         hxpChemicalJoinCabinetSearch.setUserId(SecurityUtils.getUserId());
         List<HxpChemicalJoinCabinetListVo> list = hxpChemicalJoinCabinetService.selectHxpChemicalJoinCabinetList(hxpChemicalJoinCabinetSearch);
+        //去除多余的0
+        if (list != null && list.size() > 0) {
+            list.stream().forEach(vo -> {
+                vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
+                vo.setTare(ChemicalUtils.removeZeroForAfterPoint(vo.getTare()));
+            });
+        }
         return getDataTable(list);
     }
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpHomePageStatisticsController.java

@@ -5,6 +5,7 @@ import com.zd.chemical.domain.HxpStock;
 import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.service.IHxpAlarmRecordService;
 import com.zd.chemical.service.IHxpChemicalService;
+import com.zd.chemical.util.ChemicalUtils;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
 import com.zd.common.core.web.controller.BaseController;
@@ -58,7 +59,6 @@ public class HxpHomePageStatisticsController extends BaseController {
         return ResultData.success(hxpHomeChemicalVo);
     }
 
-
     /**
      * 化学品使用量top6
      */
@@ -67,6 +67,12 @@ public class HxpHomePageStatisticsController extends BaseController {
     @ApiOperation(value = "查询化学品信息列表")
     public ResultData chemicalUsagesCount(HxpChemical hxpChemical) {
         List<HxpHomeChemicalUsagesVo> hxpHomeChemicalVo = hxpChemicalService.chemicalUsagesCount(hxpChemical);
+        //去除小数点后多余的0
+        if (hxpHomeChemicalVo != null && hxpHomeChemicalVo.size() > 0) {
+            hxpHomeChemicalVo.stream().forEach(vo -> {
+                vo.setChemicalUsages(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalUsages()));
+            });
+        }
         return ResultData.success(hxpHomeChemicalVo);
     }
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpStockController.java

@@ -6,6 +6,7 @@ import com.zd.chemical.domain.vo.HxpStockJoinVO;
 import com.zd.chemical.domain.vo.HxpStockOutVO;
 import com.zd.chemical.domain.vo.HxpStockSearch;
 import com.zd.chemical.service.IHxpStockService;
+import com.zd.chemical.util.ChemicalUtils;
 import com.zd.chemical.util.SmsSydUtil;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
@@ -85,6 +86,15 @@ public class HxpStockController extends BaseController {
     public TableDataInfo<HxpStockDetailVO> listDetail(HxpStockSearch hxpStockSearch) {
         startPage();
         List<HxpStockDetailVO> list = hxpStockService.selectHxpStockListDetail(hxpStockSearch);
+        //去除小数点后多余的0
+        if (list != null && list.size() > 0) {
+            list.stream().forEach(vo -> {
+                vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
+                vo.setTareUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getTareUnit()));
+                vo.setOutUsages(ChemicalUtils.removeZeroForAfterPoint(vo.getOutUsages()));
+                vo.setUsages(ChemicalUtils.removeZeroForAfterPoint(vo.getUsages()));
+            });
+        }
         return getDataTable(list);
     }
 
@@ -117,6 +127,15 @@ public class HxpStockController extends BaseController {
     public TableDataInfo<HxpStockJoinVO> listJoin(HxpStockSearch hxpStockSearch) {
         startPage();
         List<HxpStockJoinVO> list = hxpStockService.selectHxpStockListJoin(hxpStockSearch);
+        //去除小数点后多余的0
+        if (list != null && list.size() > 0) {
+            list.stream().forEach(vo -> {
+                vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
+                vo.setTareUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getTareUnit()));
+                vo.setOutUsages(ChemicalUtils.removeZeroForAfterPoint(vo.getOutUsages()));
+                vo.setUsages(ChemicalUtils.removeZeroForAfterPoint(vo.getUsages()));
+            });
+        }
         return getDataTable(list);
     }
 
@@ -126,6 +145,14 @@ public class HxpStockController extends BaseController {
         startPage();
         hxpStockSearch.setLoginUserId(SecurityUtils.getUserId());
         List<HxpStockJoinVO> list = hxpStockService.selectHxpStockListJoin(hxpStockSearch);
+        //去除小数点后多余的0
+        if (list != null && list.size() > 0) {
+            list.stream().forEach(vo -> {
+                vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
+                vo.setTareUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getTareUnit()));
+                vo.setUsages(ChemicalUtils.removeZeroForAfterPoint(vo.getUsages()));
+            });
+        }
         return getDataTable(list);
     }
 
@@ -165,6 +192,14 @@ public class HxpStockController extends BaseController {
         }else{
             list = hxpStockService.selectHxpStockListOut(hxpStockSearch);
         }
+        //去除小数点后多余的0
+        if (list != null && list.size() > 0) {
+            list.stream().forEach(vo -> {
+                vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
+                vo.setTareUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getTareUnit()));
+                vo.setOutUsages(ChemicalUtils.removeZeroForAfterPoint(vo.getOutUsages()));
+            });
+        }
         return getDataTable(list);
     }
 
@@ -175,6 +210,14 @@ public class HxpStockController extends BaseController {
         startPage();
         hxpStockSearch.setLoginUserId(SecurityUtils.getUserId());
         List<HxpStockOutVO> list = hxpStockService.selectHxpStockListOut(hxpStockSearch);
+        //去除小数点后多余的0
+        if (list != null && list.size() > 0) {
+            list.stream().forEach(vo -> {
+                vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
+                vo.setTareUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getTareUnit()));
+                vo.setOutUsages(ChemicalUtils.removeZeroForAfterPoint(vo.getOutUsages()));
+            });
+        }
         return getDataTable(list);
     }
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/HxpUserecordController.java

@@ -3,6 +3,7 @@ package com.zd.chemical.controller;
 import com.zd.chemical.domain.HxpUserecord;
 import com.zd.chemical.domain.vo.*;
 import com.zd.chemical.service.IHxpUserecordService;
+import com.zd.chemical.util.ChemicalUtils;
 import com.zd.chemical.util.SmsSydUtil;
 import com.zd.model.domain.R;
 import com.zd.model.domain.per.PerFun;
@@ -65,6 +66,17 @@ public class HxpUserecordController extends BaseController {
     public TableDataInfo<HxpUserecordVo> getHxpUserecordList(HxpUserecordSearch hxpUserecordSearch) {
         startPage();
         List<HxpUserecordVo> list = hxpUserecordService.getHxpUserecordList(hxpUserecordSearch);
+        //去除小数点后多余的0
+        if (list != null && list.size() > 0) {
+            list.stream().forEach(vo -> {
+                vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
+                vo.setCollectStockNum(ChemicalUtils.removeZeroForAfterPoint(vo.getCollectStockNum()));
+                vo.setCollectWeigh(ChemicalUtils.removeZeroForAfterPoint(vo.getCollectWeigh()));
+                vo.setLossAmount(ChemicalUtils.removeZeroForAfterPoint(vo.getLossAmount()));
+                vo.setReturnStockNum(ChemicalUtils.removeZeroForAfterPoint(vo.getReturnStockNum()));
+                vo.setUseStockNum(ChemicalUtils.removeZeroForAfterPoint(vo.getUseStockNum()));
+            });
+        }
         return getDataTable(list);
     }
 
@@ -74,6 +86,17 @@ public class HxpUserecordController extends BaseController {
         startPage();
         hxpUserecordSearch.setLoginUserId(tokenService.getLoginUser().getUserid());
         List<HxpUserecordVo> list = hxpUserecordService.getHxpUserecordList(hxpUserecordSearch);
+        //去除小数点后多余的0
+        if (list != null && list.size() > 0) {
+            list.stream().forEach(vo -> {
+                vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
+                vo.setCollectStockNum(ChemicalUtils.removeZeroForAfterPoint(vo.getCollectStockNum()));
+                vo.setCollectWeigh(ChemicalUtils.removeZeroForAfterPoint(vo.getCollectWeigh()));
+                vo.setLossAmount(ChemicalUtils.removeZeroForAfterPoint(vo.getLossAmount()));
+                vo.setUseStockNum(ChemicalUtils.removeZeroForAfterPoint(vo.getUseStockNum()));
+                vo.setReturnStockNum(ChemicalUtils.removeZeroForAfterPoint(vo.getReturnStockNum()));
+            });
+        }
         return getDataTable(list);
     }
 
@@ -83,7 +106,26 @@ public class HxpUserecordController extends BaseController {
     @ApiOperation(value = "获取化学品使用记录详细信息")
     @GetMapping(value = "/queryDetail/{id}")
     public R<HxpUserecordDetailVo> queryDetailById(@PathVariable("id") Long id) {
-        return R.ok(hxpUserecordService.queryDetailById(id));
+        HxpUserecordDetailVo vo = hxpUserecordService.queryDetailById(id);
+        //小数点后多余0处理
+        if (vo != null) {
+            vo.setChemicalAmountUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getChemicalAmountUnit()));
+            vo.setTareUnit(ChemicalUtils.removeZeroForAfterPoint(vo.getTareUnit()));
+            //领用
+            HxpUserecordDetailVo.OutDetail outDetail = vo.getOutDetail();
+            if (outDetail != null) {
+                outDetail.setStockSuttle(ChemicalUtils.removeZeroForAfterPoint(outDetail.getStockSuttle()));
+                outDetail.setLossAmount(ChemicalUtils.removeZeroForAfterPoint(outDetail.getLossAmount()));
+                outDetail.setCollectSuttle(ChemicalUtils.removeZeroForAfterPoint(outDetail.getCollectSuttle()));
+            }
+            //归还
+            HxpUserecordDetailVo.ReturnDetail returnDetail = vo.getReturnDetail();
+            if (returnDetail != null) {
+                returnDetail.setUseStockNum(ChemicalUtils.removeZeroForAfterPoint(returnDetail.getUseStockNum()));
+                returnDetail.setReturnSuttle(ChemicalUtils.removeZeroForAfterPoint(returnDetail.getReturnSuttle()));
+            }
+        }
+        return R.ok(vo);
     }
 
     /**

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/ActHxpapplyInfoVo.java

@@ -23,8 +23,7 @@ import java.util.List;
  */
 @ApiModel("化学品申请单")
 @Data
-public class ActHxpapplyInfoVo extends BaseEntity
-{
+public class ActHxpapplyInfoVo extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /** 主键id */

zd-modules/zd-chemical/src/main/java/com/zd/chemical/domain/vo/HxpUserecordDetailVo.java

@@ -67,7 +67,7 @@ public class HxpUserecordDetailVo {
     @ApiModelProperty(value = "归还信息")
     private ReturnDetail  returnDetail;
 
-    static class OutDetail {
+    public static class OutDetail {
         @ApiModelProperty(value = "领用时库存净重")
         private String stockSuttle;
 
@@ -149,7 +149,7 @@ public class HxpUserecordDetailVo {
         }
     }
 
-    static class ReturnDetail {
+    public static class ReturnDetail {
         @ApiModelProperty(value = "本次使用量")
         private String useStockNum;
 

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

@@ -65,8 +65,7 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
      * @return 化学品申购
      */
     @Override
-    public ActHxpapplyInfoVo selectActHxpapplyById(Long id,Integer tickStatus)
-    {
+    public ActHxpapplyInfoVo selectActHxpapplyById(Long id,Integer tickStatus) {
         // 利用申请的id,查询出工作流对应的配置节点
         ActApplytask actApplytask = new ActApplytask();
         actApplytask.setTaskId(id);

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

@@ -16,6 +16,7 @@ import com.zd.chemical.service.IHxpChemicalJoinCabinetService;
 import com.zd.chemical.service.IHxpClassifyConfigService;
 import com.zd.chemical.service.IHxpStockService;
 import com.zd.chemical.service.IHxpUserecordService;
+import com.zd.chemical.util.ChemicalUtils;
 import com.zd.chemical.util.SmsSydUtil;
 import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.exception.ServiceException;
@@ -149,6 +150,12 @@ public class HxpStockServiceImpl implements IHxpStockService {
             }
             // 计算库存净重
             a.setSuttle(a.getOutUsages().subtract(Optional.ofNullable(a.getTare()).orElse(BigDecimal.ZERO)));
+            //新加：去除末尾多余的0
+            a.setSuttle(ChemicalUtils.removeZeroForAfterPoint(a.getSuttle()));
+            a.setChemicalAmount(ChemicalUtils.removeZeroForAfterPoint(a.getChemicalAmount()));
+            a.setUsages(ChemicalUtils.removeZeroForAfterPoint(a.getUsages()));
+            a.setOutUsages(ChemicalUtils.removeZeroForAfterPoint(a.getOutUsages()));
+            a.setTare(ChemicalUtils.removeZeroForAfterPoint(a.getTare()));
         });
         return list;
     }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/util/ChemicalUtils.java

@@ -50,8 +50,11 @@ public class ChemicalUtils {
      * @return
      */
     public static BigDecimal removeZeroForAfterPoint(BigDecimal unit) {
-        String str = unit.stripTrailingZeros().toPlainString();
-        return new BigDecimal(str);
+        if (unit != null) {
+            String str = unit.stripTrailingZeros().toPlainString();
+            return new BigDecimal(str);
+        }
+        return unit;
     }
 
     /**