Merge remote-tracking branch 'origin/master'

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpBottleStorageController.java

@@ -3,13 +3,11 @@ package com.zd.airbottle.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.zd.airbottle.domain.QpBottleStorage;
 import com.zd.airbottle.domain.QpSupplier;
-import com.zd.airbottle.domain.QpTask;
 import com.zd.airbottle.domain.QpTaskDetail;
 import com.zd.airbottle.domain.vo.*;
 import com.zd.airbottle.domain.vo.report.AirAmount;
 import com.zd.airbottle.service.*;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
@@ -24,10 +22,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -276,7 +272,6 @@ public class QpBottleStorageController extends BaseController {
                 List<QpTaskDetailVO> detailListVo =  qpTaskDetailService.selectQpTaskDetailListVo(qpTaskDetail);
                 if(detailListVo.size()>0){
                     for (int j=0;j<detailListVo.size();j++){
-                        //System.out.println(detailListVo.get(j).getApplyDescribe());
                         JSONObject jsonStr = JSONObject.parseObject(detailListVo.get(j).getApplyDescribe());
                         detailListVo.get(j).setConfigName(jsonStr.get("gasLevel").toString());
                         detailListVo.get(j).setAirName(jsonStr.get("airName").toString());
@@ -297,78 +292,4 @@ public class QpBottleStorageController extends BaseController {
         }
         return getDataTable(list);
     }
-
-    /*@GetMapping("/listTaskIndexTest")
-    @ApiOperation(value = "供应商首页待办事项列表")
-    public TableDataInfo<QpBottleStorageVO> listTaskIndexTest(QpBottleStorageVO storageInfoVo) {
-        //获取当前登录用户信息
-        SysUser sysUser = tokenService.getLoginUser().getSysUser();
-        QpSupplier supplier = qpSupplierService.selectQpSupplierByAccountId(sysUser.getUserId());
-
-        startPage();
-        storageInfoVo.setCompanyId(supplier.getId());//供应商id
-        List<QpBottleStorageVO> list = qpBottleStorageService.selectQpTaskListIndex(storageInfoVo);
-        for (int i = 0; i < list.size(); i++) {
-            if("gq".equals(list.get(i).getRemark())){
-                QpTaskVO taskVO = new QpTaskVO();
-                taskVO.setSupplierId(supplier.getId());//供应商id
-                taskVO.setCreateTime(list.get(i).getCreateTime());//时间
-                taskVO.setIsDispose(0);//未处理
-                List<QpTaskVO> listvo= qpTaskService.selectQpTaskList(taskVO);
-
-                if(!listvo.isEmpty()){
-                    QpTaskDetail qpTaskDetail = new QpTaskDetail();
-                    qpTaskDetail.setTaskId(listvo.get(i).getId());
-                    List<QpTaskDetailVO> detailListVo =  qpTaskDetailService.selectQpTaskDetailListVo(qpTaskDetail);
-                    for (QpTaskDetailVO taskDetailVO : detailListVo) {
-                        System.out.println(taskDetailVO.getApplyDescribe());
-                        JSONObject jsonStr = JSONObject.parseObject(taskDetailVO.getApplyDescribe());
-                        taskDetailVO.setConfigName(jsonStr.get("gasLevel").toString());
-                        taskDetailVO.setAirName(jsonStr.get("airName").toString());
-                    }
-                    list.get(i).setDetailListVO(detailListVo);
-                }
-
-            }else if("wt".equals(list.get(i).getRemark())){
-                //查询问题气瓶集合
-                QpBottleStorageVO storageVO = new QpBottleStorageVO();
-                storageVO.setCompanyId(supplier.getId());
-                storageVO.setCreateTime(list.get(i).getCreateTime());
-                storageVO.setAirStatus(1L);//问题气瓶
-                List<QpBottleStorageVO> listWt = qpBottleStorageService.selectStorageListRelation(storageVO);
-                for (QpBottleStorageVO bottleStorageVO : listWt) {
-                    QpTaskVO taskVO = qpTaskService.selectQpTaskById(bottleStorageVO.getTaskId());
-                    QpTaskDetail taskDetail = qpTaskDetailService.selectQpTaskDetailById(bottleStorageVO.getTaskDetailId());
-                    bottleStorageVO.setRoom(taskVO.getRoom());//房间号
-                    bottleStorageVO.setCampus(taskVO.getCampus());//校区
-                    bottleStorageVO.setBuilding(taskVO.getBuilding());//楼栋
-                    JSONObject jsonStr = JSONObject.parseObject(taskDetail.getApplyDescribe());
-                    bottleStorageVO.setConfigName(jsonStr.get("gasLevel").toString());
-                    bottleStorageVO.setAirName(jsonStr.get("airName").toString());
-                }
-            }else if("hs".equals(list.get(i).getRemark())){
-                //查询回收集合
-                QpBottleStorageOutVO outVO = new QpBottleStorageOutVO();
-                outVO.setCreateTime(list.get(i).getCreateTime());
-                outVO.setCompanyId(supplier.getId());
-                outVO.setRemark("0");//未处理
-                List<QpBottleStorageOutVO> listHs = qpBottleStorageOutService.selectQpBottleStorageOutRelationSubject(outVO);
-                for (int q=0;q<listHs.size();q++){
-                    QpTaskVO taskVO = qpTaskService.selectQpTaskById(listHs.get(q).getTaskId());
-                    QpTaskDetail taskDetail = new QpTaskDetail();
-                    taskDetail.setId(listHs.get(q).getTaskDetailId());
-                    taskDetail.setTaskId(listHs.get(q).getTaskId());
-                    //List<QpTaskDetail> listDetail =  qpTaskDetailService.selectQpTaskDetailList();
-                    //QpTaskDetail taskDetail = qpTaskDetailService.selectQpTaskDetailById(listWt.get(q).getTaskDetailId());
-                    *//*listWt.get(q).setRoom(taskVO.getRoom());//房间号
-                    listWt.get(q).setCampus(taskVO.getCampus());//校区
-                    listWt.get(q).setBuilding(taskVO.getBuilding());//楼栋
-                    JSONObject jsonStr = JSONObject.parseObject(listDetail.get(0).getApplyDescribe());
-                    listWt.get(q).setConfigName(jsonStr.get("gasLevel").toString());
-                    listWt.get(q).setAirName(jsonStr.get("airName").toString());*//*
-                }
-            }
-        }
-        return getDataTable(list);
-    }*/
 }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpBottleStorageManageController.java

@@ -7,7 +7,6 @@ import com.zd.airbottle.domain.vo.*;
 import com.zd.airbottle.service.*;
 import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
-import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
@@ -100,10 +99,6 @@ public class QpBottleStorageManageController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response,QpBottleStorageVO qpBottleStorage) throws IOException
     {
-        /*List<QpBottleStorageVO> list = qpBottleStorageService.selectQpBottleStorageList(qpBottleStorage);
-        ExcelUtil<QpBottleStorageVO> util = new ExcelUtil<QpBottleStorageVO>(QpBottleStorageVO.class);
-        util.exportExcel(response, list, "气瓶入库数据");*/
-
         List<QpBottleStorageExcelVo> listVo = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<QpBottleStorageVO> list = qpBottleStorageService.selectQpBottleStorageList(qpBottleStorage);

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpBottleStorageOutController.java

@@ -8,7 +8,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.zd.airbottle.domain.*;
 import com.zd.airbottle.domain.vo.QpBottleStorageOutVO;
-import com.zd.airbottle.domain.vo.QpTaskDetailVO;
 import com.zd.airbottle.domain.vo.QpTransportUserVo;
 import com.zd.airbottle.service.*;
 import com.zd.common.core.utils.StringUtils;
@@ -24,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
 import com.zd.common.core.utils.poi.ExcelUtil;
@@ -35,7 +33,7 @@ import com.zd.common.core.web.page.TableDataInfo;
 
 /**
  * 气瓶出库Controller
- * 
+ *
  * @author zd
  * @date 2022-05-23
  */
@@ -116,7 +114,6 @@ public class QpBottleStorageOutController extends BaseController
         detail.setId(bottleStorage.getTaskDetailId());
         detail.setTaskId(bottleStorage.getTaskId());
         List<QpTaskDetail> detailList = qpTaskDetailService.selectQpTaskDetailList(detail);
-        //QpTaskDetailVO taskDetailVO = qpTaskDetailService.selectRelationByDetailsId(bottleStorage.getTaskDetailId());
         map.put("taskDetail",detailList.size()>0?detailList.get(0):detail);
 
         //清单详情

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpBottleStorageOutManageController.java

@@ -102,10 +102,6 @@ public class QpBottleStorageOutManageController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response,QpBottleStorageOutVO qpBottleStorageOut) throws IOException
     {
-        /*List<QpBottleStorageOutVO> list = qpBottleStorageOutService.selectQpBottleStorageOutList(qpBottleStorageOut);
-        ExcelUtil<QpBottleStorageOutVO> util = new ExcelUtil<QpBottleStorageOutVO>(QpBottleStorageOutVO.class);
-        util.exportExcel(response, list, "气瓶出库数据");*/
-
         List<QpBottleStorageOutExcelVo> listexcel = new ArrayList<QpBottleStorageOutExcelVo>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<QpBottleStorageOutVO> list = qpBottleStorageOutService.selectQpBottleStorageOutList(qpBottleStorageOut);

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpFlowController.java

@@ -21,7 +21,6 @@ import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.airbottle.domain.QpFlow;
 import com.zd.airbottle.service.IQpFlowService;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -30,7 +29,7 @@ import com.zd.common.core.web.page.TableDataInfo;
 
 /**
  * 气瓶审核流程Controller
- * 
+ *
  * @author zd
  * @date 2022-06-13
  */

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpFlowDetailController.java

@@ -5,7 +5,6 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
 import com.zd.airbottle.domain.vo.QpFlowDetailVO;
-import com.zd.airbottle.domain.vo.QpFlowVO;
 import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +23,6 @@ import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.airbottle.domain.QpFlowDetail;
 import com.zd.airbottle.service.IQpFlowDetailService;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.domain.AjaxResult;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpQualificationApplyController.java

@@ -108,7 +108,6 @@ public class QpQualificationApplyController extends BaseController
     {
         //获取当前登录用户信息
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
-        Map map = new HashMap();
 
         String type="lead";
         //查询当前用户负责的实验室集合

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpTaskController.java

@@ -257,7 +257,7 @@ public class QpTaskController extends BaseController
             for (QpTaskVO qpTaskVO : listDate) {
                 // 1.待办清单集合
                 qpTaskVo.setCreateTime(qpTaskVO.getCreateTime());
-                qpTaskVo.setIsDispose(Integer.valueOf(qpTaskVo.getRemarkStatus()));//处理状态
+                qpTaskVo.setIsDispose(qpTaskVo.getRemarkStatus());//处理状态
                 qpTaskVo.setCompanyId(supplier.getId());//商家id
                 List<QpTaskVO> list =  qpTaskService.selectQpTaskBySubjectRelation(qpTaskVo);
 
@@ -627,15 +627,6 @@ public class QpTaskController extends BaseController
         }
         map.put("list",listRvo);
         return AjaxResult.success(map);
-
-        //获取当前登录用户信息 selectQpTaskDetailByDetailsIdRelation
-        /*SysUser sysUser = tokenService.getLoginUser().getSysUser();
-        qpTask.setUserId(sysUser.getUserId());//当前登陆人申请数据
-        startPage();
-        List<QpAirGoodsConfigRelationVo> list = qpTaskDetailService.selectQpTaskDetailStock(id);
-        return getDataTable(list);*/
-
-
     }
 
     /***
@@ -646,12 +637,6 @@ public class QpTaskController extends BaseController
     @ApiOperation(value = "查询待办清单表列表")
     public AjaxResult listWps(Long id)
     {
-        //获取当前登录用户信息
-        /*SysUser sysUser = tokenService.getLoginUser().getSysUser();
-        qpTask.setUserId(sysUser.getUserId());//当前登陆人申请数据*/
-        /*startPage();
-        List<QpAirGoodsConfigRelationVo> list = qpTaskDetailService.selectQpTaskDetailDistribute(id);
-        return getDataTable(list);*/
         Map<String,Object> map = new HashMap<>();
 
         //查询该待办清单下的具体申请信息
@@ -687,9 +672,6 @@ public class QpTaskController extends BaseController
     @ApiOperation(value = "查询待办清单表列表")
     public TableDataInfo<QpAirGoodsConfigRelationVo> listYrk(Long id)
     {
-        //获取当前登录用户信息
-        /*SysUser sysUser = tokenService.getLoginUser().getSysUser();
-        qpTask.setUserId(sysUser.getUserId());//当前登陆人申请数据*/
         startPage();
         List<QpAirGoodsConfigRelationVo> list = qpTaskDetailService.selectQpTaskDetailDealWith(id);
         return getDataTable(list);
@@ -703,9 +685,6 @@ public class QpTaskController extends BaseController
     @ApiOperation(value = "查询待办清单表列表")
     public TableDataInfo<QpAirGoodsConfigRelationVo> listYjs(Long id)
     {
-        //获取当前登录用户信息
-        /*SysUser sysUser = tokenService.getLoginUser().getSysUser();
-        qpTask.setUserId(sysUser.getUserId());//当前登陆人申请数据*/
         startPage();
         List<QpAirGoodsConfigRelationVo> list = qpTaskDetailService.selectQpTaskDetailRefuse(id);
         return getDataTable(list);

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpTaskManageController.java

@@ -2,7 +2,6 @@ package com.zd.airbottle.controller;
 
 import com.zd.airbottle.domain.QpBottleStorage;
 import com.zd.airbottle.domain.QpTask;
-import com.zd.airbottle.domain.QpTaskDetail;
 import com.zd.airbottle.domain.vo.*;
 import com.zd.airbottle.service.*;
 import com.zd.common.core.domain.per.PerFun;
@@ -53,9 +52,6 @@ public class QpTaskManageController extends BaseController
     @Autowired
     private TokenService tokenService;
 
-    //@Autowired
-    //private IQpTransportUserService qpTransportUserService;
-
     @Autowired
     private IQpAirGoodsConfigService qpAirGoodsConfigService;
 

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpUsegasApplyController.java

@@ -10,8 +10,6 @@ import com.zd.airbottle.domain.*;
 import com.zd.airbottle.domain.vo.*;
 import com.zd.airbottle.service.IQpFlowDetailService;
 import com.zd.airbottle.service.IQpUsegasAuditRecordService;
-import com.zd.common.core.domain.per.PerFun;
-import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.security.service.TokenService;
 import com.zd.system.api.domain.SysUser;
@@ -27,7 +25,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.zd.common.response.ResultData;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.airbottle.service.IQpUsegasApplyService;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
@@ -91,7 +88,6 @@ public class QpUsegasApplyController extends BaseController
     {
         List<QpUsegasApplyExcelVo> list = qpUsegasApplyService.qpUsegasApplyExportExcel(qpUsegasApply);
         ExcelUtil<QpUsegasApplyExcelVo> util = new ExcelUtil<QpUsegasApplyExcelVo>(QpUsegasApplyExcelVo.class);
-        /*util.exportExcel(response, list, "用气申请数据");*/
         //本地日期,不包括时分秒
         LocalDate nowDate = LocalDate.now();
         util.exportExcel(response, list, "用气申请数据", null, "用气申请信息导出表"+nowDate);
@@ -183,8 +179,6 @@ public class QpUsegasApplyController extends BaseController
         map.put("isAdmin",isAdmin);
         map.put("audit",audit);
 
-        /*List<QpAirGoodsConfigRelationVo> airBottlelist = qpQualificationApplyDetailService.selectQpQualificationApplyDetailListRelation(qpQualificationApply.getId());
-        map.put("airBottlelist",airBottlelist);*/
 
         //审核记录
         QpUsegasAuditRecord auditRecord = new QpUsegasAuditRecord();
@@ -233,11 +227,6 @@ public class QpUsegasApplyController extends BaseController
             throw new ServiceException("参数为空！");
         }
         return ResultData.result(qpUsegasApplyService.updateQpUsegasApplyRepeat(qpUsegasApply));
-        /*//删除数据
-        qpUsegasApplyService.deleteQpUsegasApplyById(qpUsegasApply.getId());
-        //qpUsegasApplyService.selectQpUsegasApplyById(qpUsegasApply.getId());
-        //重新录入
-        return ResultData.result(qpUsegasApplyService.insertQpUsegasApply(qpUsegasApply));*/
     }
 
     /**

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpUsegasApplyManageController.java

@@ -1,7 +1,6 @@
 package com.zd.airbottle.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import com.zd.airbottle.domain.QpFlowDetail;
 import com.zd.airbottle.domain.QpUsegasApply;
 import com.zd.airbottle.domain.QpUsegasAuditRecord;
 import com.zd.airbottle.domain.vo.QpFlowDetailVO;
@@ -13,7 +12,6 @@ import com.zd.airbottle.service.IQpUsegasAuditRecordService;
 import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.domain.AjaxResult;
@@ -129,7 +127,6 @@ public class QpUsegasApplyManageController extends BaseController
         //导出审核通过的数据
         List<QpUsegasApplyExcelVo> list = qpUsegasApplyService.qpUsegasApplyExportExcel(qpUsegasApply);
         ExcelUtil<QpUsegasApplyExcelVo> util = new ExcelUtil<QpUsegasApplyExcelVo>(QpUsegasApplyExcelVo.class);
-        /*util.exportExcel(response, list, "用气申请数据");*/
         //本地日期,不包括时分秒
         LocalDate nowDate = LocalDate.now();
         util.exportExcel(response, list, "用气申请数据", null, "用气申请信息导出表"+nowDate);

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpTask.java

@@ -1,7 +1,5 @@
 package com.zd.airbottle.domain;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zd.common.core.annotation.Excel;
@@ -120,11 +118,12 @@ public class QpTask extends BaseEntity
     {
         return locationId;
     }
+    @Override
     public void setUserId(Long userId)
     {
         this.userId = userId;
     }
-
+    @Override
     public Long getUserId()
     {
         return userId;
@@ -147,20 +146,22 @@ public class QpTask extends BaseEntity
     {
         return phone;
     }
+    @Override
     public void setDeptId(Long deptId)
     {
         this.deptId = deptId;
     }
-
+    @Override
     public Long getDeptId()
     {
         return deptId;
     }
+    @Override
     public void setDeptName(String deptName)
     {
         this.deptName = deptName;
     }
-
+    @Override
     public String getDeptName()
     {
         return deptName;
@@ -192,4 +193,4 @@ public class QpTask extends BaseEntity
                 .append("createTime", getCreateTime())
                 .toString();
     }
-}
+}

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpUsegasApply.java

@@ -177,11 +177,12 @@ public class QpUsegasApply extends BaseEntity
     @Override
     public void setUserId(Long userId) {        this.userId = userId;    }
 
+    @Override
     public void setDeptId(Long deptId)
     {
         this.deptId = deptId;
     }
-
+    @Override
     public Long getDeptId()
     {
         return deptId;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/QpBottleStorageOutExcelVo.java

@@ -2,20 +2,16 @@ package com.zd.airbottle.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import org.hibernate.validator.constraints.Length;
-
-import java.util.Date;
 
 /**
  * 气瓶出库对象 qp_bottle_storage_out
- * 
+ *
  * @author zd
  * @date 2022-05-23
  */

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/QpBottleStorageOutVO.java

@@ -1,24 +1,13 @@
 package com.zd.airbottle.domain.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.airbottle.domain.QpBottleStorage;
 import com.zd.airbottle.domain.QpBottleStorageOut;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-import org.hibernate.validator.constraints.Length;
-
-import java.util.Date;
 import java.util.List;
 
 /**
  * 气瓶出库对象 qp_bottle_storage_out
- * 
+ *
  * @author zd
  * @date 2022-05-23
  */

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/QpQualificationApplyExcelVo.java

@@ -1,12 +1,9 @@
 package com.zd.airbottle.domain.vo;
 
-import com.zd.airbottle.domain.QpQualificationApply;
-import com.zd.airbottle.domain.QpQualificationApplyDetail;
 import com.zd.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
 
-import java.util.List;
 
 /**
  * @Author: liujh

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/QpTaskExcelVo.java

@@ -1,15 +1,8 @@
 package com.zd.airbottle.domain.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zd.airbottle.domain.QpTask;
-import com.zd.airbottle.domain.QpTaskDetail;
-import com.zd.airbottle.domain.QpTransportUser;
 import com.zd.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
 
-import java.util.Date;
-import java.util.List;
 
 /**
  * 待办清单对象 qp_task

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/QpTaskVO.java

@@ -27,7 +27,7 @@ public class QpTaskVO extends QpTask
 
     private List<QpBottleStorageOutVO> bottleStorageOutVOList;//出库集合
 
-    List<QpAirGoodsConfigRelationVo> airGoodsConfigRelationVo;//
+    private List<QpAirGoodsConfigRelationVo> airGoodsConfigRelationVo;//
 
     private String campus;//校区
 
@@ -188,4 +188,4 @@ public class QpTaskVO extends QpTask
     public Integer getIsDispose() {        return isDispose;    }
 
     public void setIsDispose(Integer isDispose) {        this.isDispose = isDispose;    }
-}
+}

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/QpUsegasApplyExcelVo.java

@@ -5,8 +5,6 @@ import com.zd.common.core.annotation.Excel;
 import com.zd.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.validator.constraints.Length;
 
 import java.util.Date;
@@ -109,4 +107,4 @@ public class QpUsegasApplyExcelVo extends BaseEntity
     }
 
 
-}
+}

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/vo/QpUsegasApplyVO.java

@@ -1,16 +1,8 @@
 package com.zd.airbottle.domain.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.airbottle.domain.QpUsegasApply;
-import com.zd.common.core.annotation.Excel;
-import com.zd.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.hibernate.validator.constraints.Length;
 
-import java.util.Date;
 
 /**
  * 用气申请对象 qp_usegas_apply
@@ -44,4 +36,4 @@ public class QpUsegasApplyVO extends QpUsegasApply
     public Long getAdminId() {        return adminId;    }
 
     public void setAdminId(Long adminId) {        this.adminId = adminId;    }
-}
+}

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/mapper/QpQualificationApplyDetailMapper.java

@@ -3,19 +3,18 @@ package com.zd.airbottle.mapper;
 import java.util.List;
 import com.zd.airbottle.domain.QpQualificationApplyDetail;
 import com.zd.airbottle.domain.vo.QpAirGoodsConfigRelationVo;
-import com.zd.airbottle.domain.vo.QpQualificationApplyDetailVO;
 
 /**
  * 资格申请详情Mapper接口
- * 
+ *
  * @author zd
  * @date 2022-05-10
  */
-public interface QpQualificationApplyDetailMapper 
+public interface QpQualificationApplyDetailMapper
 {
     /**
      * 查询资格申请详情
-     * 
+     *
      * @param id 资格申请详情主键
      * @return 资格申请详情
      */
@@ -23,7 +22,7 @@ public interface QpQualificationApplyDetailMapper
 
     /**
      * 查询资格申请详情列表
-     * 
+     *
      * @param qpQualificationApplyDetail 资格申请详情
      * @return 资格申请详情集合
      */
@@ -31,7 +30,7 @@ public interface QpQualificationApplyDetailMapper
 
     /**
      * 新增资格申请详情
-     * 
+     *
      * @param qpQualificationApplyDetail 资格申请详情
      * @return 结果
      */
@@ -39,7 +38,7 @@ public interface QpQualificationApplyDetailMapper
 
     /**
      * 修改资格申请详情
-     * 
+     *
      * @param qpQualificationApplyDetail 资格申请详情
      * @return 结果
      */
@@ -47,7 +46,7 @@ public interface QpQualificationApplyDetailMapper
 
     /**
      * 删除资格申请详情
-     * 
+     *
      * @param id 资格申请详情主键
      * @return 结果
      */
@@ -55,7 +54,7 @@ public interface QpQualificationApplyDetailMapper
 
     /**
      * 批量删除资格申请详情
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/mapper/QpSpecificationMapper.java

@@ -2,19 +2,18 @@ package com.zd.airbottle.mapper;
 
 import java.util.List;
 import com.zd.airbottle.domain.QpSpecification;
-import com.zd.airbottle.domain.QpSpecification;
 
 /**
  * 气瓶规格Mapper接口
- * 
+ *
  * @author zd
  * @date 2022-05-09
  */
-public interface QpSpecificationMapper 
+public interface QpSpecificationMapper
 {
     /**
      * 查询气瓶规格
-     * 
+     *
      * @param id 气瓶规格主键
      * @return 气瓶规格
      */
@@ -22,7 +21,7 @@ public interface QpSpecificationMapper
 
     /**
      * 查询气瓶规格列表
-     * 
+     *
      * @param qpSpecification 气瓶规格
      * @return 气瓶规格集合
      */
@@ -30,7 +29,7 @@ public interface QpSpecificationMapper
 
     /**
      * 新增气瓶规格
-     * 
+     *
      * @param qpSpecification 气瓶规格
      * @return 结果
      */
@@ -38,7 +37,7 @@ public interface QpSpecificationMapper
 
     /**
      * 修改气瓶规格
-     * 
+     *
      * @param qpSpecification 气瓶规格
      * @return 结果
      */
@@ -46,7 +45,7 @@ public interface QpSpecificationMapper
 
     /**
      * 删除气瓶规格
-     * 
+     *
      * @param id 气瓶规格主键
      * @return 结果
      */
@@ -54,7 +53,7 @@ public interface QpSpecificationMapper
 
     /**
      * 批量删除气瓶规格
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/IQpFlowDetailService.java

@@ -3,19 +3,18 @@ package com.zd.airbottle.service;
 import java.util.List;
 import com.zd.airbottle.domain.QpFlowDetail;
 import com.zd.airbottle.domain.vo.QpFlowDetailVO;
-import com.zd.airbottle.domain.vo.QpFlowVO;
 
 /**
  * 气瓶流程详情Service接口
- * 
+ *
  * @author zd
  * @date 2022-06-13
  */
-public interface IQpFlowDetailService 
+public interface IQpFlowDetailService
 {
     /**
      * 查询气瓶流程详情
-     * 
+     *
      * @param id 气瓶流程详情主键
      * @return 气瓶流程详情
      */
@@ -23,7 +22,7 @@ public interface IQpFlowDetailService
 
     /**
      * 查询气瓶流程详情列表
-     * 
+     *
      * @param qpFlowDetail 气瓶流程详情
      * @return 气瓶流程详情集合
      */
@@ -39,7 +38,7 @@ public interface IQpFlowDetailService
 
     /**
      * 新增气瓶流程详情
-     * 
+     *
      * @param qpFlow 气瓶流程详情
      * @return 结果
      */
@@ -47,7 +46,7 @@ public interface IQpFlowDetailService
 
     /**
      * 修改气瓶流程详情
-     * 
+     *
      * @param qpFlowDetail 气瓶流程详情
      * @return 结果
      */
@@ -55,7 +54,7 @@ public interface IQpFlowDetailService
 
     /**
      * 批量删除气瓶流程详情
-     * 
+     *
      * @param ids 需要删除的气瓶流程详情主键集合
      * @return 结果
      */
@@ -63,7 +62,7 @@ public interface IQpFlowDetailService
 
     /**
      * 删除气瓶流程详情信息
-     * 
+     *
      * @param id 气瓶流程详情主键
      * @return 结果
      */

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/IQpQualificationApplyDetailService.java

@@ -3,19 +3,18 @@ package com.zd.airbottle.service;
 import java.util.List;
 import com.zd.airbottle.domain.QpQualificationApplyDetail;
 import com.zd.airbottle.domain.vo.QpAirGoodsConfigRelationVo;
-import com.zd.airbottle.domain.vo.QpQualificationApplyDetailVO;
 
 /**
  * 资格申请详情Service接口
- * 
+ *
  * @author zd
  * @date 2022-05-10
  */
-public interface IQpQualificationApplyDetailService 
+public interface IQpQualificationApplyDetailService
 {
     /**
      * 查询资格申请详情
-     * 
+     *
      * @param id 资格申请详情主键
      * @return 资格申请详情
      */
@@ -23,7 +22,7 @@ public interface IQpQualificationApplyDetailService
 
     /**
      * 查询资格申请详情列表
-     * 
+     *
      * @param qpQualificationApplyDetail 资格申请详情
      * @return 资格申请详情集合
      */
@@ -31,7 +30,7 @@ public interface IQpQualificationApplyDetailService
 
     /**
      * 新增资格申请详情
-     * 
+     *
      * @param qpQualificationApplyDetail 资格申请详情
      * @return 结果
      */
@@ -39,7 +38,7 @@ public interface IQpQualificationApplyDetailService
 
     /**
      * 修改资格申请详情
-     * 
+     *
      * @param qpQualificationApplyDetail 资格申请详情
      * @return 结果
      */
@@ -47,7 +46,7 @@ public interface IQpQualificationApplyDetailService
 
     /**
      * 批量删除资格申请详情
-     * 
+     *
      * @param ids 需要删除的资格申请详情主键集合
      * @return 结果
      */
@@ -55,7 +54,7 @@ public interface IQpQualificationApplyDetailService
 
     /**
      * 删除资格申请详情信息
-     * 
+     *
      * @param id 资格申请详情主键
      * @return 结果
      */

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/QpAirGoodsConfigServiceImpl.java

@@ -1,7 +1,6 @@
 package com.zd.airbottle.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.json.JSONUtil;
 import com.zd.airbottle.domain.QpAirGoodsConfig;
 import com.zd.airbottle.domain.vo.QpAirGoodsConfigRelationVo;
 import com.zd.airbottle.domain.vo.QpAirGoodsConfigVo;
@@ -126,16 +125,17 @@ public class QpAirGoodsConfigServiceImpl implements IQpAirGoodsConfigService {
     @Override
     public List<QpAirGoodsConfigRelationVo> selectQpAirGoodsConfigRelationList(QpAirGoodsConfigRelationVo relationVo) {
 
+        /* 此处注释 切勿删除
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
         AjaxResult dept = remoteDeptService.getInfoById(sysUser.getDept().getDeptId());
         LinkedHashMap<String,String> linkedHashMap = (LinkedHashMap<String, String>) dept.get("data");
-        String deptId = linkedHashMap.get("ancestors").toString();
+        String deptId = linkedHashMap.get("ancestors");
         //查询登录用户所属的院校的供应商
         if("0".equals(deptId)){
-            relationVo.setDeptId(Long.valueOf(linkedHashMap.get("dept_id").toString()));
+            relationVo.setDeptId(Long.valueOf(linkedHashMap.get("dept_id")));
         }else{
             relationVo.setDeptId( Long.valueOf(deptId.split(",")[1]));
-        }
+        }*/
         return qpAirGoodsConfigMapper.selectQpAirGoodsConfigRelationList(relationVo);
     }
 

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/QpBottleStorageOutServiceImpl.java

@@ -10,14 +10,11 @@ import com.zd.airbottle.domain.vo.QpBottleStorageVO;
 import com.zd.airbottle.mapper.*;
 import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.utils.DateUtils;
 import com.zd.common.datascope.annotation.DataScope;
 import com.zd.common.security.service.TokenService;
-import com.zd.common.security.utils.SaveUtil;
 
 import com.zd.system.api.domain.SysUser;
 import com.zd.system.api.message.RemoteMessageService;
-import io.swagger.annotations.ApiImplicitParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zd.airbottle.service.IQpBottleStorageOutService;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/QpBottleStorageServiceImpl.java

@@ -107,10 +107,6 @@ public class QpBottleStorageServiceImpl implements IQpBottleStorageService {
             qpBottleStorage.setRejectionApplyTime(new Date());
         } else if (qpBottleStorage.getAirStatus() == 0) {
             //入库
-            /*QpBottleStorage qbs = qpBottleStorageMapper.getByElectronicTag(qpBottleStorage.getElectronicTag());
-            if (qbs != null) {
-                throw new ServiceException("电子标签已存在！");
-            }*/
 
             //查询标签信息
             QpRfidTag rfidTag = qpRfidTagService.selectByTag(qpBottleStorage.getElectronicTag());

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/QpFlowDetailServiceImpl.java

@@ -4,18 +4,12 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import com.zd.airbottle.domain.QpFlow;
 import com.zd.airbottle.domain.vo.QpFlowDetailVO;
-import com.zd.airbottle.domain.vo.QpFlowVO;
 import com.zd.airbottle.mapper.QpFlowMapper;
 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.datascope.annotation.DataScope;
 import com.zd.common.security.service.TokenService;
-import com.zd.common.security.utils.SaveUtil;
 
-import com.zd.system.api.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -89,7 +83,6 @@ public class QpFlowDetailServiceImpl implements IQpFlowDetailService
         //SaveUtil.setCommonAttr(qpFlowDetail);
 
 
-        SysUser sysUser = tokenService.getLoginUser().getSysUser();
         List<QpFlowDetail> list = qpFlow.getFlowDetailList();
         if(list!=null && list.size()>0){
             for (QpFlowDetail detail:list) {

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/QpQualificationApplyDetailServiceImpl.java

@@ -2,12 +2,8 @@ package com.zd.airbottle.service.impl;
 
 import java.util.List;
 
-import com.zd.airbottle.domain.QpAirGoodsConfig;
-import com.zd.airbottle.domain.QpSpecificationDetail;
+
 import com.zd.airbottle.domain.vo.QpAirGoodsConfigRelationVo;
-import com.zd.airbottle.domain.vo.QpQualificationApplyDetailVO;
-import com.zd.airbottle.mapper.QpAirGoodsConfigMapper;
-import com.zd.airbottle.mapper.QpSpecificationDetailMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zd.airbottle.mapper.QpQualificationApplyDetailMapper;
@@ -16,19 +12,19 @@ import com.zd.airbottle.service.IQpQualificationApplyDetailService;
 
 /**
  * 资格申请详情Service业务层处理
- * 
+ *
  * @author zd
  * @date 2022-05-10
  */
 @Service
-public class QpQualificationApplyDetailServiceImpl implements IQpQualificationApplyDetailService 
+public class QpQualificationApplyDetailServiceImpl implements IQpQualificationApplyDetailService
 {
     @Autowired
     private QpQualificationApplyDetailMapper qpQualificationApplyDetailMapper;
 
     /**
      * 查询资格申请详情
-     * 
+     *
      * @param id 资格申请详情主键
      * @return 资格申请详情
      */
@@ -40,7 +36,7 @@ public class QpQualificationApplyDetailServiceImpl implements IQpQualificationAp
 
     /**
      * 查询资格申请详情列表
-     * 
+     *
      * @param qpQualificationApplyDetail 资格申请详情
      * @return 资格申请详情
      */
@@ -52,7 +48,7 @@ public class QpQualificationApplyDetailServiceImpl implements IQpQualificationAp
 
     /**
      * 新增资格申请详情
-     * 
+     *
      * @param qpQualificationApplyDetail 资格申请详情
      * @return 结果
      */
@@ -64,7 +60,7 @@ public class QpQualificationApplyDetailServiceImpl implements IQpQualificationAp
 
     /**
      * 修改资格申请详情
-     * 
+     *
      * @param qpQualificationApplyDetail 资格申请详情
      * @return 结果
      */
@@ -76,7 +72,7 @@ public class QpQualificationApplyDetailServiceImpl implements IQpQualificationAp
 
     /**
      * 批量删除资格申请详情
-     * 
+     *
      * @param ids 需要删除的资格申请详情主键
      * @return 结果
      */
@@ -88,7 +84,7 @@ public class QpQualificationApplyDetailServiceImpl implements IQpQualificationAp
 
     /**
      * 删除资格申请详情信息
-     * 
+     *
      * @param id 资格申请详情主键
      * @return 结果
      */
@@ -106,24 +102,6 @@ public class QpQualificationApplyDetailServiceImpl implements IQpQualificationAp
     @Override
     public List<QpAirGoodsConfigRelationVo> selectQpQualificationApplyDetailListRelation(Long id) {
         List<QpAirGoodsConfigRelationVo> list = qpQualificationApplyDetailMapper.selectQpQualificationApplyDetailListRelation(id);
-        /*if(list.size()>0){
-            for (int i=0;i<list.size();i++){
-                QpAirGoodsConfig gc =recursionGoodsConfig(list.get(i).getParentId());
-                QpSpecificationDetail specificationDetail = qpSpecificationDetailMapper.selectQpSpecificationDetailById(gc.getConfigId());
-                if(specificationDetail!=null){
-                    list.get(i).setParent(specificationDetail.getSpecValue());
-                }
-            }
-        }*/
         return list;
     }
-
-   /* //递归查询气瓶规格
-    public QpAirGoodsConfig recursionGoodsConfig(Long id){
-        QpAirGoodsConfig  goodsConfig = qpAirGoodsConfigMapper.selectQpAirGoodsConfigById(id);
-        if(goodsConfig.getParentId()== -1){
-            return goodsConfig;
-        }
-        return recursionGoodsConfig(goodsConfig.getParentId());
-    }*/
 }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/QpQualificationApplyServiceImpl.java

@@ -219,12 +219,7 @@ public class QpQualificationApplyServiceImpl implements IQpQualificationApplySer
      */
     @Override
     public List<QpQualificationApplyVO> selectQpApplyList(QpQualificationApplyVO applyVO) {
-        /*if(StringUtils.isNull(applyVO.getLeadAuditStatus()) ){
-            throw new ServiceException("缺少查询参数！");
-        }*/
-
-        List<QpQualificationApplyVO> list = qpQualificationApplyMapper.selectQpApplyList(applyVO);
-        return list;
+        return qpQualificationApplyMapper.selectQpApplyList(applyVO);
     }
 
     /***

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/QpTaskDetailServiceImpl.java

@@ -1,13 +1,9 @@
 package com.zd.airbottle.service.impl;
 
-import com.zd.airbottle.domain.QpAirGoodsConfig;
-import com.zd.airbottle.domain.QpSpecificationDetail;
 import com.zd.airbottle.domain.QpTaskDetail;
 import com.zd.airbottle.domain.vo.QpAirBottleConfigVo;
 import com.zd.airbottle.domain.vo.QpAirGoodsConfigRelationVo;
 import com.zd.airbottle.domain.vo.QpTaskDetailVO;
-import com.zd.airbottle.mapper.QpAirGoodsConfigMapper;
-import com.zd.airbottle.mapper.QpSpecificationDetailMapper;
 import com.zd.airbottle.mapper.QpTaskDetailMapper;
 import com.zd.airbottle.service.IQpAirBottleConfigService;
 import com.zd.airbottle.service.IQpTaskDetailService;
@@ -117,17 +113,7 @@ public class QpTaskDetailServiceImpl implements IQpTaskDetailService {
      */
     @Override
     public List<QpTaskDetailVO> selectQpTaskDetailByIdRelation(Long id) {
-        List<QpTaskDetailVO> list = qpTaskDetailMapper.selectQpTaskDetailByIdRelation(id);
-        /*if(!list.isEmpty()){
-            for (int i=0;i<list.size();i++){
-                QpAirGoodsConfig gc =recursionGoodsConfig(list.get(i).getParentId());
-                QpSpecificationDetail specificationDetail = qpSpecificationDetailMapper.selectQpSpecificationDetailById(gc.getConfigId());
-                if(specificationDetail!=null){
-                    list.get(i).setParent(specificationDetail.getSpecValue());
-                }
-            }
-        }*/
-        return list;
+        return qpTaskDetailMapper.selectQpTaskDetailByIdRelation(id);
     }
 
     /**
@@ -138,17 +124,7 @@ public class QpTaskDetailServiceImpl implements IQpTaskDetailService {
      */
     @Override
     public List<QpAirGoodsConfigRelationVo> selectQpTaskDetailByDetailsIdRelation(Long id) {
-        List<QpAirGoodsConfigRelationVo> list = qpTaskDetailMapper.selectQpTaskDetailByDetailsIdRelation(id);
-        /*if(!list.isEmpty()){
-            for (int i=0;i<list.size();i++){
-                QpAirGoodsConfig gc =recursionGoodsConfig(list.get(i).getParentId());
-                QpSpecificationDetail specificationDetail = qpSpecificationDetailMapper.selectQpSpecificationDetailById(gc.getConfigId());
-                if(specificationDetail!=null){
-                    list.get(i).setParent(specificationDetail.getSpecValue());
-                }
-            }
-        }*/
-        return list;
+        return qpTaskDetailMapper.selectQpTaskDetailByDetailsIdRelation(id);
     }
 
     /**
@@ -159,11 +135,7 @@ public class QpTaskDetailServiceImpl implements IQpTaskDetailService {
      */
     @Override
     public QpTaskDetailVO selectRelationByDetailsId(Long id) {
-        QpTaskDetailVO taskDetailVO = qpTaskDetailMapper.selectRelationByDetailsId(id);
-        /*QpAirGoodsConfig gc = recursionGoodsConfig(taskDetailVO.getParentId());
-        QpSpecificationDetail specificationDetail = qpSpecificationDetailMapper.selectQpSpecificationDetailById(gc.getConfigId());
-        taskDetailVO.setParent(specificationDetail.getSpecValue());*/
-        return taskDetailVO;
+        return qpTaskDetailMapper.selectRelationByDetailsId(id);
     }
 
     /*//递归查询气瓶规格
@@ -260,16 +232,6 @@ public class QpTaskDetailServiceImpl implements IQpTaskDetailService {
      */
     @Override
     public List<QpAirGoodsConfigRelationVo> selectQpTaskDetailRelationList(QpAirGoodsConfigRelationVo airGoodsConfigRelationVo) {
-        List<QpAirGoodsConfigRelationVo> list = qpTaskDetailMapper.selectQpTaskDetailRelationList(airGoodsConfigRelationVo);
-        /*if(!list.isEmpty()){
-            for (int i=0;i<list.size();i++){
-                QpAirGoodsConfig gc =recursionGoodsConfig(list.get(i).getParentId());
-                QpSpecificationDetail specificationDetail = qpSpecificationDetailMapper.selectQpSpecificationDetailById(gc.getConfigId());
-                if(specificationDetail!=null){
-                    list.get(i).setParent(specificationDetail.getSpecValue());
-                }
-            }
-        }*/
-        return list;
+        return qpTaskDetailMapper.selectQpTaskDetailRelationList(airGoodsConfigRelationVo);
     }
 }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/QpTaskServiceImpl.java

@@ -164,12 +164,6 @@ public class QpTaskServiceImpl implements IQpTaskService {
     public int updateQpTask(QpTaskVO qpTaskVO) {
         SysUser sysUser = tokenService.getLoginUser().getSysUser();
         if ("1".equals(qpTaskVO.getRemark())) {
-            //配送
-            /*qpTask.setIsDispose(1);//已处理
-            qpTask.setDisposeUser(sysUser.getNickName());
-            qpTask.setDisposeUserid(sysUser.getUserId());
-            qpTask.setDisposeTime(new Date());*/
-
             //查询供应商信息
             QpSupplier qpSupplier = qpSupplierService.selectQpSupplierByAccountId(sysUser.getUserId());
             //查询本条订单的所有详情集合

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpUsegasApplyMapper.xml

@@ -247,14 +247,6 @@
             <if test="safetyPrecautions != null">safety_precautions = #{safetyPrecautions},</if>
             <if test="useGasId != null">use_gas_id = #{useGasId},</if>
             <if test="useGasName != null">use_gas_name = #{useGasName},</if>
-           <!-- <if test="leadAuditStaus != null">lead_audit_staus = #{leadAuditStaus},</if>-->
-            <!--<if test="leadAuditUserid != null">lead_audit_userid = #{leadAuditUserid},</if>-->
-            <!--<if test="leadAuditUsername != null">lead_audit_username = #{leadAuditUsername},</if>-->
-            <!--<if test="leadAuditTime != null">lead_audit_time = #{leadAuditTime},</if>-->
-           <!-- <if test="leadAuditCause != null">lead_audit_cause = #{leadAuditCause},</if>-->
-            <!--<if test="centerAuditStatus != null">center_audit_status = #{centerAuditStatus},</if>-->
-            <!--<if test="centerAuditUserid != null">center_audit_userid = #{centerAuditUserid},</if>-->
-            <!--<if test="centerAuditUsername != null">center_audit_username = #{centerAuditUsername},</if>-->
             <if test="centerAuditTime != null">center_audit_time = #{centerAuditTime},</if>
             <if test="centerAuditCause != null">center_audit_cause = #{centerAuditCause},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabCheckRecordController.java

@@ -651,6 +651,7 @@ public class LabCheckRecordController extends BaseController {
         LabCheckRecordDetailsVO yzgDetailsVo = new LabCheckRecordDetailsVO();
         yzgDetailsVo.setCheckId(id);
         yzgDetailsVo.setIsZg(0L);//已整改
+        yzgDetailsVo.setIsZgStatus(0);//非无法整改
         List<LabCheckRecordDetailsVO> yzglist= labCheckRecordDetailsService.selectLabCheckRecordDetailsListVo(yzgDetailsVo);
         //对象复制
         /*LabCheckRecordVO checkRecordVO = new LabCheckRecordVO();

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSecurityApplyController.java

@@ -43,15 +43,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
 
 /**
  * 安全准入申请Controller