ZongYue / lpg

Download as
Browse Code »

Commit f3c368e1da7239367928f92936b0af0e7c4db131

Authored by lst
1 parent 3fc2929e
Exists in dev

修改：类型相关字段修改

Showing 58 changed files with 594 additions and 367 deletions   Show diff stats
backend/assembly/src/main/resources/application-dev.yml
  Diff comments   View file @f3c368e
... ... @@ -189,6 +189,8 @@ sms:
189 189  
190 190 qprk:
191 191 dsfurl-enable: true #气瓶入库时，不是本系统中的气瓶是否获取第三方气瓶数据开关
  192 +qpcz:
  193 + enable: true #气瓶充装
192 194  
193 195 #阿里大于短信配置
194 196 alisms:
... ...
backend/lpg-api/src/main/java/com/hotent/lpg/api/controller/EnterpriseLargeScreenController.java
  Diff comments   View file @f3c368e
... ... @@ -80,7 +80,7 @@ public class EnterpriseLargeScreenController {
80 80 double jd = 113.755413;// 113.74676792256132
81 81 double wd = 30.83492;// 30.83621614100548
82 82  
83   - Map<String, Double> stringDoubleMap = CoordinatesTransformControllerUtil.transformGCJ2WGS(jd, wd);
  83 + Map<String, Double> stringDoubleMap = CoordinatesTransformControllerUtil.transformGCJ2WGS(wd, jd);
84 84 System.out.println(stringDoubleMap);
85 85 }
86 86 }
... ...
backend/lpg-auth/src/main/java/com/hotent/lpg/auth/controller/AuthMobileController.java
  Diff comments   View file @f3c368e
... ... @@ -93,7 +93,7 @@ public class AuthMobileController {
93 93 hyxx.setFXm(request.getPhone());
94 94 hyxx.setFHylx(HylxEnum.jm.getInfo());
95 95 hyxx.setFZt(UserStateEnum.zc.getInfo());
96   - hyxx.setFSfzc(SfztEnum.y.getInfo());
  96 + hyxx.setFSfzc(SfztEnum.y.getCode());
97 97  
98 98 WHyxx byHyxx = wHyxxManager.createByHyxx(hyxx);
99 99  
... ...
backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/AjlxEnum.java
  Diff comments   View file @f3c368e
1 1 package com.hotent.lpg.common.enums;
2 2  
  3 +import com.sun.org.apache.xalan.internal.xsltc.dom.SortingIterator;
3 4 import lombok.AllArgsConstructor;
4 5 import lombok.Getter;
5 6  
... ... @@ -22,4 +23,10 @@ public enum AjlxEnum {
22 23  
23 24 private final String code;
24 25 private final String info;
  26 +
  27 + public static void main(String[] args) {
  28 + String info = AjlxEnum.valueOf("dqaj").getInfo();
  29 + System.out.println(info);
  30 + }
25 31 }
  32 +
... ...
backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/QplzjdmcEnum.java
  Diff comments   View file @f3c368e
... ... @@ -54,6 +54,10 @@ public enum QplzjdmcEnum {
54 54 */
55 55 smps("smps", "上门配送"),
56 56 /**
  57 + * 入户安检
  58 + */
  59 + rhaj("rhaj", "入户安检"),
  60 + /**
57 61 * 上门自提
58 62 */
59 63 smzt("smzt", "上门自提"),
... ...
backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/QpztEnum.java
  Diff comments   View file @f3c368e
... ... @@ -57,7 +57,17 @@ public enum QpztEnum {
57 57 /**
58 58 * 已回收
59 59 */
60   - yhs("yhs", "已回收")
  60 + yhs("yhs", "已回收"),
  61 +
  62 + /**
  63 + * 报废
  64 + */
  65 + bf("bf", "报废"),
  66 +
  67 + /**
  68 + * 超期未检
  69 + */
  70 + cqwj("cqwj", "超期未检")
61 71 ;
62 72  
63 73  
... ...
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/ThreadUtil/WQpxxThread.java
  Diff comments   View file @f3c368e
... ... @@ -104,7 +104,11 @@ public class WQpxxThread extends Thread {
104 104 }
105 105 try (PreparedStatement preparedStatement = connection.prepareStatement(insert1.toString())) {
106 106 preparedStatement.execute();
107   - mQpssxxDao.insertFromWqpxx(wQpxxes.stream().map(a -> a.getId()).collect(Collectors.toList()));
  107 + List<String> qpIdList = wQpxxes.stream().map(a -> a.getId()).collect(Collectors.toList());
  108 +// mQpssxxDao.updateQpzt_zc(qpIdList);
  109 +// mQpssxxDao.updateQpzt_cqwj(qpIdList);
  110 +// mQpssxxDao.updateQpzt_bf(qpIdList);
  111 + mQpssxxDao.insertFromWqpxx(qpIdList);
108 112 } catch (SQLException e) {
109 113 e.printStackTrace();
110 114 }
... ...
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MCzglController.java
  Diff comments   View file @f3c368e
1 1 package com.hotent.lpg.manage.controller;
2 2  
3 3  
  4 +import cn.hutool.core.bean.BeanUtil;
4 5 import com.baomidou.mybatisplus.core.metadata.IPage;
  6 +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
  7 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5 8 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 9 import com.hotent.base.controller.BaseController;
7 10 import com.hotent.base.model.CommonResult;
  11 +import com.hotent.base.util.BeanUtils;
8 12 import com.hotent.base.util.StringUtil;
  13 +import com.hotent.base.util.UniqueIdUtil;
  14 +import com.hotent.lpg.common.enums.QplzjdmcEnum;
  15 +import com.hotent.lpg.common.enums.QpztEnum;
9 16 import com.hotent.lpg.common.model.WCzgl;
  17 +import com.hotent.lpg.common.model.WQpssxx;
  18 +import com.hotent.lpg.common.model.WQpxx;
  19 +import com.hotent.lpg.common.util.ExcelUtils;
  20 +import com.hotent.lpg.manage.dto.QpssxxDto;
10 21 import com.hotent.lpg.manage.manager.MCzglManager;
  22 +import com.hotent.lpg.manage.manager.MQpssxxManager;
  23 +import com.hotent.lpg.manage.manager.MQpxxManager;
11 24 import io.swagger.annotations.ApiOperation;
12 25 import io.swagger.annotations.ApiParam;
13 26 import lombok.extern.slf4j.Slf4j;
14 27 import org.springframework.web.bind.annotation.*;
  28 +import org.springframework.web.multipart.MultipartFile;
  29 +
  30 +import javax.annotation.Resource;
  31 +import java.io.ByteArrayInputStream;
  32 +import java.io.InputStream;
  33 +import java.time.LocalDateTime;
  34 +import java.util.ArrayList;
  35 +import java.util.List;
15 36  
16 37 /**
17 38 * 充装管理 前端控制器
... ... @@ -25,6 +46,11 @@ import org.springframework.web.bind.annotation.*;
25 46 @RequestMapping("/manage/wCzgl/v1/")
26 47 public class MCzglController extends BaseController<MCzglManager, WCzgl> {
27 48  
  49 + @Resource
  50 + private MQpxxManager mQpxxManager;
  51 + @Resource
  52 + private MQpssxxManager mQpssxxManager;
  53 +
28 54 /**
29 55 * 根据id获取充装管理数据详情
30 56 *
... ... @@ -56,6 +82,7 @@ public class MCzglController extends BaseController&lt;MCzglManager, WCzgl&gt; {
56 82  
57 83 /**
58 84 * 移动端：气瓶充装列表（气瓶查询中的充装信息）
  85 + *
59 86 * @param page
60 87 * @param qptm
61 88 * @return
... ... @@ -76,4 +103,90 @@ public class MCzglController extends BaseController&lt;MCzglManager, WCzgl&gt; {
76 103 }
77 104 return CommonResult.ok().value(resultPage);
78 105 }
  106 +
  107 + /**
  108 + * 充装记录导入
  109 + *
  110 + * @param file 充装记录
  111 + * @return
  112 + * @throws Exception
  113 + */
  114 + @ApiOperation(value = "充装记录导入")
  115 + @PostMapping("/fillingUpImport")
  116 + public CommonResult<Object> bottleBatchImport(@RequestParam("file") MultipartFile file) throws Exception {
  117 + byte[] byteArr = file.getBytes();
  118 + InputStream inputStream = new ByteArrayInputStream(byteArr);
  119 + List<List<Object>> list = ExcelUtils.getListByExcelVersion3(inputStream, file.getOriginalFilename());
  120 + if (ObjectUtils.isEmpty(list)) {
  121 + return CommonResult.error("未检测到气瓶信息");
  122 + }
  123 + List<WCzgl> WCzgls = new ArrayList<>();
  124 + toWCzgl(list, WCzgls);
  125 + baseService.saveOrUpdateBatch(WCzgls);
  126 + return CommonResult.ok().value("气瓶充装信息导入成功");
  127 + }
  128 +
  129 + private void toWCzgl(List<List<Object>> list, List<WCzgl> WCzgls) {
  130 + LocalDateTime now = LocalDateTime.now();
  131 + for (List<Object> row : list) {
  132 + String qptm = row.get(0).toString();
  133 + WQpxx qpxx = mQpxxManager.getOne(Wrappers.<WQpxx>lambdaQuery().eq(WQpxx::getFQptm, qptm));
  134 + if (qpxx == null) {
  135 + log.info("气瓶信息不存在，气瓶条码={}", qptm);
  136 + continue;
  137 + }
  138 + WQpssxx wQpssxx = mQpssxxManager.getOne(Wrappers.<WQpssxx>lambdaQuery().eq(WQpssxx::getFQpid, qpxx.getId()));//气瓶实时信息
  139 + if (BeanUtils.isEmpty(wQpssxx)) {
  140 + log.info("气瓶实时信息不存在，气瓶条码={}", qptm);
  141 + continue;
  142 + }
  143 + WCzgl wCzgl = new WCzgl();
  144 + wCzgl.setFCzsj(now);
  145 + wCzgl.setFCzqzmc("模拟充装气站");
  146 + wCzgl.setFCzxkzbh("00000000");
  147 + wCzgl.setFCzqz(qpxx.getFQpjz() + "");
  148 + wCzgl.setFCzhz(qpxx.getFQpjz().add(qpxx.getFQprj()) + "");
  149 + wCzgl.setFCzqwgjc("合格");
  150 + wCzgl.setFCzqpfjc("合格");
  151 + wCzgl.setFCzqfzjc("合格");
  152 + wCzgl.setFCzqhjjc("合格");
  153 + wCzgl.setFCzqjcxm("001");
  154 + wCzgl.setFCzqjcgh("001");
  155 + wCzgl.setFCzqczgh("001");
  156 + wCzgl.setFCzqczxm("001");
  157 + wCzgl.setFCzqjcsj(now);
  158 + wCzgl.setFCzhxljc("合格");
  159 + wCzgl.setFCzhsjczl(qpxx.getFQprj() + "");
  160 + wCzgl.setFCzhfjjc("合格");
  161 + wCzgl.setFCzhjsbq("合格");
  162 + wCzgl.setFCzhxxbq("合格");
  163 + wCzgl.setFFcsj(now);
  164 + wCzgl.setFQptm(qptm);
  165 + wCzgl.setFQpid(qpxx.getId());
  166 + wCzgl.setFSsczmc(qpxx.getFSsczmc());
  167 + wCzgl.setFSsczid(qpxx.getFSsczid());
  168 + wCzgl.setFSsqyid(qpxx.getFSsqyid());
  169 + wCzgl.setFSsqymc(qpxx.getFSsqymc());
  170 + wCzgl.setFQpbh(qpxx.getFQpbh());
  171 + wCzgl.setFSfyxqn("是");
  172 + wCzgl.setFJyqn("是");
  173 + wCzgl.setFCzgz("净重模式");
  174 + wCzgl.setFSfcz("否");
  175 + wCzgl.setFCzkssj(now);
  176 + wCzgl.setFCzjssj(now);
  177 + wCzgl.setFCzqh(null);
  178 + wCzgl.setFQpgg(qpxx.getFQpgg());
  179 + wCzgl.setFCzjz(qpxx.getFCzjz());
  180 + wCzgl.setFSjzl(wCzgl.getFCzhz());
  181 + wCzgl.setFTzms("自动停止");
  182 + QpssxxDto qpssxxDto = new QpssxxDto();
  183 + BeanUtil.copyProperties(wQpssxx, qpssxxDto);
  184 + qpssxxDto.setFZqbh(UniqueIdUtil.getSuid());
  185 + qpssxxDto.setFCtzt(QpztEnum.mp.getCode());
  186 + qpssxxDto.setFLzmc(QplzjdmcEnum.qpcz.getInfo());
  187 + wQpssxx = mQpssxxManager.createOrUpdate(qpssxxDto);
  188 + wCzgl.setFQplzid(wQpssxx.getFQplzid());
  189 + WCzgls.add(wCzgl);
  190 + }
  191 + }
79 192 }
... ...
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MQplxController.java
  Diff comments   View file @f3c368e
... ... @@ -50,7 +50,7 @@ public class MQplxController {
50 50 throw new RuntimeException("员工信息不存在");
51 51 }
52 52 //分页查询
53   - wQplx.setfSfsj(QplxztEnum.ysj.getInfo());
  53 + wQplx.setfSfsj(QplxztEnum.ysj.getCode());
54 54 wQplx.setfSsczid(wYgxx.getFSsczid());
55 55 IPage<WQplx> resultPage = mQplxManager.staffQplxPage(page, wQplx);
56 56 YgqpResponse ygqpResponse = new YgqpResponse();
... ...
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/dao/MQpssxxDao.java
  Diff comments   View file @f3c368e
... ... @@ -22,4 +22,7 @@ public interface MQpssxxDao extends BaseMapper&lt;WQpssxx&gt; {
22 22  
23 23 int insertFromWqpxx(List<String> collect);
24 24  
  25 + void updateQpzt_zc(List<String> qpIdList);
  26 + void updateQpzt_cqwj(List<String> qpIdList);
  27 + void updateQpzt_bf(List<String> qpIdList);
25 28 }
... ...
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MAjManagerImpl.java
  Diff comments   View file @f3c368e
1 1 package com.hotent.lpg.manage.manager.impl;
2 2  
3 3 import cn.hutool.core.bean.BeanUtil;
  4 +import cn.hutool.core.util.ObjectUtil;
4 5 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
5 6 import com.baomidou.mybatisplus.core.metadata.IPage;
6 7 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
... ... @@ -78,18 +79,18 @@ public class MAjManagerImpl extends BaseManagerImpl&lt;MAjDao, WAj&gt; implements MAjM
78 79 @Override
79 80 public IPage<AjxxVo> pageList(Page page, AjDto ajDto, String filterFieldSql) {
80 81 ArrayList<String> ajzt = new ArrayList<>();
81   - if ("完成安检".equals(ajDto.getFAjjl())) {
82   - ajzt.add("已整改");
83   - ajzt.add("完成安检");
  82 + if (AjztEnum.wcaj.getInfo().equals(ajDto.getFAjjl())) {
  83 + ajzt.add(AjztEnum.yzg.getCode());
  84 + ajzt.add(AjztEnum.wcaj.getCode());
84 85 }
85   - if ("待整改".equals(ajDto.getFAjjl())) {
86   - ajzt.add("待整改");
  86 + if (AjztEnum.dzg.getInfo().equals(ajDto.getFAjjl())) {
  87 + ajzt.add(AjztEnum.dzg.getCode());
87 88 }
88 89 if ("随瓶".equals(ajDto.getFAjlx())) {
89   - ajDto.setFAjlx("随瓶安检");
  90 + ajDto.setFAjlx(AjlxEnum.spaj.getCode());
90 91 }
91 92 if ("定期".equals(ajDto.getFAjlx())) {
92   - ajDto.setFAjlx("定期安检");
  93 + ajDto.setFAjlx(AjlxEnum.dqaj.getCode());
93 94 }
94 95 if ("全部".equals(ajDto.getFAjjl())) {
95 96 ajDto.setFAjjl(null);
... ... @@ -189,12 +190,12 @@ public class MAjManagerImpl extends BaseManagerImpl&lt;MAjDao, WAj&gt; implements MAjM
189 190  
190 191 String sfjsbcps = rhaj.getSfjsbcps();
191 192 if (SfztEnum.y.getInfo().equals(sfjsbcps)) {
192   - wAj.setFAjzt(AjztEnum.dzg.getInfo());
  193 + wAj.setFAjzt(AjztEnum.dzg.getCode());
193 194 } else {
194   - wAj.setFAjzt(AjztEnum.wcaj.getInfo());
  195 + wAj.setFAjzt(AjztEnum.wcaj.getCode());
195 196 }
196 197 if ("存在隐患".equals(rhaj.getAjjg())) {//加一层判断以这个为准
197   - wAj.setFAjzt(AjztEnum.dzg.getInfo());
  198 + wAj.setFAjzt(AjztEnum.dzg.getCode());
198 199 }
199 200 baseMapper.insert(wAj);
200 201 List<WAjxq> wAjxqList = new ArrayList<>();//安检详情集合
... ... @@ -226,7 +227,7 @@ public class MAjManagerImpl extends BaseManagerImpl&lt;MAjDao, WAj&gt; implements MAjM
226 227 if (wAj == null) {
227 228 throw new RuntimeException("安检工单不存在");
228 229 }
229   - if (AjztEnum.yzg.getInfo().equals(wAj.getFAjzt())) {
  230 + if (AjztEnum.yzg.getCode().equals(wAj.getFAjzt())) {
230 231 throw new RuntimeException("安检工单已整改");
231 232 }
232 233 wAj.setFWxsj(LocalDateTime.now());
... ... @@ -240,7 +241,7 @@ public class MAjManagerImpl extends BaseManagerImpl&lt;MAjDao, WAj&gt; implements MAjM
240 241 wAj.setFWxrczid(wYgxx.getFSsczid());
241 242 wAj.setFWxrqymc(wYgxx.getFSsqymc());
242 243 wAj.setFWxrczmc(wYgxx.getFSsczmc());
243   - wAj.setFAjzt(AjztEnum.yzg.getInfo());
  244 + wAj.setFAjzt(AjztEnum.yzg.getCode());
244 245 baseMapper.updateById(wAj);
245 246 }
246 247  
... ... @@ -251,6 +252,9 @@ public class MAjManagerImpl extends BaseManagerImpl&lt;MAjDao, WAj&gt; implements MAjM
251 252 if (wYgxx == null) {
252 253 throw new RuntimeException("员工信息不存在");
253 254 }
  255 + if (ObjectUtil.isNotEmpty(wAj.getFAjzt())) {
  256 + wAj.setFAjzt(AjztEnum.valueOf(wAj.getFAjzt()).getCode());
  257 + }
254 258 wAj.setFJcczid(wYgxx.getFSsczid());
255 259 ArrayList<String> orgList = scriptImpl.getDataPermission("loginUserSubCurOrgs");
256 260 Page<WAj> result = baseMapper.staffAjPage(page, wAj, orgList);
... ... @@ -259,6 +263,8 @@ public class MAjManagerImpl extends BaseManagerImpl&lt;MAjDao, WAj&gt; implements MAjM
259 263 List<WAjxq> ajxqList = mAjxqManager.list(Wrappers.<WAjxq>lambdaQuery().eq(WAjxq::getfAjid, record.getId()));
260 264 Map<String, List<WAjxq>> sslxMap = ajxqList.stream().collect(Collectors.groupingBy(WAjxq::getfSslx));
261 265 record.setSslxMap(sslxMap);
  266 + record.setFAjzt(AjztEnum.valueOf(record.getFAjzt()).getInfo());
  267 + record.setFAjlx(AjlxEnum.valueOf(record.getFAjlx()).getInfo());
262 268 }
263 269 return result;
264 270 }
... ... @@ -271,6 +277,8 @@ public class MAjManagerImpl extends BaseManagerImpl&lt;MAjDao, WAj&gt; implements MAjM
271 277 Map<String, List<WAjxq>> sslxMap = ajxqList.stream().collect(Collectors.groupingBy(WAjxq::getfSslx));
272 278 detail.setSslxMap(sslxMap);
273 279 }
  280 + detail.setFAjzt(AjztEnum.valueOf(detail.getFAjzt()).getInfo());
  281 + detail.setFAjlx(AjlxEnum.valueOf(detail.getFAjlx()).getInfo());
274 282 return detail;
275 283 }
276 284  
... ...
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MClxxManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -67,7 +67,7 @@ public class MClxxManagerImpl extends BaseManagerImpl&lt;MClxxDao, WClxx&gt; implement
67 67 if (wYgxx == null) {
68 68 throw new RuntimeException("员工信息不存在");
69 69 }
70   - if (YglxEnum.czyg.getInfo().equals(wYgxx.getFSslx())) {
  70 + if (YglxEnum.czyg.getCode().equals(wYgxx.getFSslx())) {
71 71 WCzxx wCzxx = mCzxxDao.selectById(wYgxx.getFSsczid());
72 72 if (wCzxx == null) {
73 73 throw new RuntimeException("员工所属厂站信息不存在");
... ... @@ -75,7 +75,7 @@ public class MClxxManagerImpl extends BaseManagerImpl&lt;MClxxDao, WClxx&gt; implement
75 75 wClxx.setFSsczID(wYgxx.getFSsczid());
76 76 result = baseMapper.clxxPage(page, wClxx);
77 77 }
78   - if (YglxEnum.qyyg.getInfo().equals(wYgxx.getFSslx())) {
  78 + if (YglxEnum.qyyg.getCode().equals(wYgxx.getFSslx())) {
79 79 WQyxx wQyxx = mQyxxDao.selectById(wYgxx.getFSsqyid());
80 80 if (wQyxx == null) {
81 81 throw new RuntimeException("员工所属企业信息不存在");
... ...
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MDdManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -263,7 +263,7 @@ public class MDdManagerImpl extends BaseManagerImpl&lt;MDdDao, WDd&gt; implements MDdM
263 263  
264 264 //订单数据
265 265 wDd.setFPsrid(wYgxx.getId());//配送人id
266   - wDd.setFPsfs(DdpsfsEnum.ps.getInfo());//配送方式
  266 + wDd.setFPsfs(DdpsfsEnum.ps.getCode());//配送方式
267 267 wDd.setFDdzt(DdztEnum.COMPLETED.getCode());//订单状态
268 268 wDd.setFBz(khxx.getBz());//备注
269 269 wDd.setFSjwcsj(now_string);//实际完成时间
... ... @@ -295,7 +295,7 @@ public class MDdManagerImpl extends BaseManagerImpl&lt;MDdDao, WDd&gt; implements MDdM
295 295 if (SfztEnum.y.getInfo().equals(sfjsbcps)) {
296 296 //停止配送，结束订单
297 297 log.info("安检信息不通过，停止配送，订单id={}，订单编号={}", wDd.getId(), wDd.getFDddh());
298   - if (DdlyEnum.wdps.getInfo().equals(wDd.getFDdly())) {
  298 + if (DdlyEnum.wdps.getCode().equals(wDd.getFDdly())) {
299 299 log.info("无单配送结束配送，删除订单信息");
300 300 baseMapper.deleteById(wDd.getId());
301 301 wDdxqManager.remove(Wrappers.<WDdxq>lambdaQuery().eq(WDdxq::getfDdid, wDd.getId()));
... ... @@ -315,11 +315,11 @@ public class MDdManagerImpl extends BaseManagerImpl&lt;MDdDao, WDd&gt; implements MDdM
315 315  
316 316  
317 317 //满瓶发出
318   - String fMpfcqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, khxx, now, mpfc, QpcyzlxEnum.hy.getInfo(), QpztEnum.mp.getInfo(), QplzjdmcEnum.smps.getInfo(), wDd.getFHyyhid(), wQpssxxList_mpfc, wDd);
  318 + String fMpfcqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, khxx, now, mpfc, QpcyzlxEnum.hy.getCode(), QpztEnum.mp.getCode(), QplzjdmcEnum.smps.getInfo(), wDd.getFHyyhid(), wQpssxxList_mpfc, wDd);
319 319 //空瓶回收
320   - String fKphsqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, khxx, now, kphs, QpcyzlxEnum.yg.getInfo(), QpztEnum.kp.getInfo(), QplzjdmcEnum.kphssqg.getInfo(), wYgxx.getFUserid(), wQpssxxList_kphs, wDd);
  320 + String fKphsqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, khxx, now, kphs, QpcyzlxEnum.yg.getCode(), QpztEnum.kp.getCode(), QplzjdmcEnum.kphssqg.getInfo(), wYgxx.getFUserid(), wQpssxxList_kphs, wDd);
321 321 //满瓶回收
322   - String fMphsqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, khxx, now, mphs, QpcyzlxEnum.yg.getInfo(), QpztEnum.mp.getInfo(), QplzjdmcEnum.mphssqg.getInfo(), wYgxx.getFUserid(), wQpssxxList_mphs, wDd);
  322 + String fMphsqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, khxx, now, mphs, QpcyzlxEnum.yg.getCode(), QpztEnum.mp.getCode(), QplzjdmcEnum.mphssqg.getInfo(), wYgxx.getFUserid(), wQpssxxList_mphs, wDd);
323 323  
324 324  
325 325 //会员用气记录
... ... @@ -399,14 +399,14 @@ public class MDdManagerImpl extends BaseManagerImpl&lt;MDdDao, WDd&gt; implements MDdM
399 399 throw new RuntimeException("请添加无单配送气瓶类型");
400 400 }
401 401 StaffOrderRequest.Spxx spxx = new StaffOrderRequest.Spxx();
402   - spxx.setDdbz(DdlyEnum.wdps.getInfo());
  402 + spxx.setDdbz(DdlyEnum.wdps.getCode());
403 403 if (CollectionUtils.isNotEmpty(mpfc)) {
404 404 spxx.setNum(mpfc.size());
405 405 } else {
406 406 spxx.setNum(0);
407 407 }
408 408 spxx.setQplxID(wqplx.getId());
409   - CreateOrderRequest request = getCreateOrderRequest(khxx, spxx, DdlyEnum.wdps.getInfo());
  409 + CreateOrderRequest request = getCreateOrderRequest(khxx, spxx, DdlyEnum.wdps.getCode());
410 410 ArrayList<CreateOrderRequest.XqVO> xqVOS = new ArrayList<>();
411 411 CreateOrderRequest.XqVO xqVO = new CreateOrderRequest.XqVO();
412 412 xqVO.setQplxId(spxx.getQplxID());
... ... @@ -430,7 +430,7 @@ public class MDdManagerImpl extends BaseManagerImpl&lt;MDdDao, WDd&gt; implements MDdM
430 430 log.info("气瓶类型信息不存在，气瓶类型id={}", spxx.getQplxID());
431 431 throw new RuntimeException("气瓶信息不存在");
432 432 }
433   - CreateOrderRequest request = getCreateOrderRequest(khxx, spxx, DdlyEnum.bzxd.getInfo());
  433 + CreateOrderRequest request = getCreateOrderRequest(khxx, spxx, DdlyEnum.bzxd.getCode());
434 434 ArrayList<CreateOrderRequest.XqVO> xqVOS = new ArrayList<>();
435 435 CreateOrderRequest.XqVO xqVO = new CreateOrderRequest.XqVO();
436 436 xqVO.setQplxId(spxx.getQplxID());
... ... @@ -565,18 +565,18 @@ public class MDdManagerImpl extends BaseManagerImpl&lt;MDdDao, WDd&gt; implements MDdM
565 565 }
566 566 //校验满瓶发出气瓶信息
567 567 for (WQpssxx wQpssxx : mpfcQpssxxList) {
568   - if (!QpcyzlxEnum.cz.getInfo().equals(wQpssxx.getFCyzlx())) {
  568 + if (!QpcyzlxEnum.cz.getCode().equals(wQpssxx.getFCyzlx())) {
569 569 throw new RuntimeException(wQpssxx.getFQptm() + "当前不在厂站，无法发出");
570 570 }
571   - if (QpcyzlxEnum.cz.getInfo().equals(wQpssxx.getFCyzlx()) && !wQpssxx.getFCyczid().equals(wdd.getFCzid())) {
  571 + if (QpcyzlxEnum.cz.getCode().equals(wQpssxx.getFCyzlx()) && !wQpssxx.getFCyczid().equals(wdd.getFCzid())) {
572 572 throw new RuntimeException(wQpssxx.getFQptm() + "实时厂站信息与订单厂站信息不符，无法发出");
573 573 }
574 574 }
575 575  
576   - fMpfcqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, null, now, mpfc, QpcyzlxEnum.hy.getInfo(), QpztEnum.mp.getInfo(), QplzjdmcEnum.smzt.getInfo(), wdd.getFHyyhid(), wQpssxxList_mpfc, wdd);
  576 + fMpfcqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, null, now, mpfc, QpcyzlxEnum.hy.getCode(), QpztEnum.mp.getCode(), QplzjdmcEnum.smzt.getInfo(), wdd.getFHyyhid(), wQpssxxList_mpfc, wdd);
577 577 }
578   - String fKphsqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, null, now, kphs, QpcyzlxEnum.cz.getInfo(), QpztEnum.kp.getInfo(), QplzjdmcEnum.czzkphs.getInfo(), null, wQpssxxList_kphs, wdd);
579   - String fMphsqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, null, now, mphs, QpcyzlxEnum.cz.getInfo(), QpztEnum.mp.getInfo(), QplzjdmcEnum.czzmphs.getInfo(), null, wQpssxxList_mphs, wdd);
  578 + String fKphsqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, null, now, kphs, QpcyzlxEnum.cz.getCode(), QpztEnum.kp.getCode(), QplzjdmcEnum.czzkphs.getInfo(), null, wQpssxxList_kphs, wdd);
  579 + String fMphsqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, null, now, mphs, QpcyzlxEnum.cz.getCode(), QpztEnum.mp.getCode(), QplzjdmcEnum.czzmphs.getInfo(), null, wQpssxxList_mphs, wdd);
580 580  
581 581 //会员用气记录
582 582 wHyyqjlManager.createWHyyqjlList(wQpssxxList_mpfc, wdd, now_string, now, null, wYgxx);
... ... @@ -663,7 +663,7 @@ public class MDdManagerImpl extends BaseManagerImpl&lt;MDdDao, WDd&gt; implements MDdM
663 663 request.setXdrid(ContextUtil.getCurrentUserId());
664 664 request.setXdrmc(ContextUtil.getCurrentUser().getFullname());
665 665 request.setDdly(ddly);
666   - request.setPsfs(DdpsfsEnum.ps.getInfo());
  666 + request.setPsfs(DdpsfsEnum.ps.getCode());
667 667 request.setJd(khxx.getJd());
668 668 request.setWd(khxx.getWd());
669 669 if (spxx != null) {
... ...
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MHyxxManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -66,7 +66,7 @@ public class MHyxxManagerImpl extends BaseManagerImpl&lt;MHyxxDao, WHyxx&gt; implement
66 66 hyxx1.setFSjh(wHydzVo.getFLxrdh());
67 67 hyxx1.setFHync(wHydzVo.getFLxr());
68 68 hyxx1.setFXm(wHydzVo.getFLxr());
69   - hyxx1.setFSfzc(SfztEnum.n.getInfo());
  69 + hyxx1.setFSfzc(SfztEnum.n.getCode());
70 70  
71 71 hyxx1.setFHylx(wHydzVo.getFHylx());
72 72 hyxx1.setFSfzh(wHydzVo.getFSfzh());
... ... @@ -146,7 +146,7 @@ public class MHyxxManagerImpl extends BaseManagerImpl&lt;MHyxxDao, WHyxx&gt; implement
146 146 if (ObjectUtils.isEmpty(data)) {
147 147 throw new RuntimeException("会员信息不存在，会员id=" + wHyxx.getId());
148 148 }
149   - data.setFRzzt(RzztEnum.valueOf(wHyxx.getFRzzt()).getInfo());
  149 + data.setFRzzt(RzztEnum.valueOf(wHyxx.getFRzzt()).getCode());
150 150 data.setFLy(wHyxx.getFLy());
151 151 baseMapper.updateById(data);
152 152 }
... ...
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MHyyqjlManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -58,7 +58,7 @@ public class MHyyqjlManagerImpl extends BaseManagerImpl&lt;MHyyqjlDao, WHyyqjl&gt; imp
58 58 wHyyqjl.setFXgsj(now);
59 59 wHyyqjl.setFQplzid(wQpssxx.getFQplzid());
60 60 wHyyqjl.setFDdid(wDd.getId());
61   - wHyyqjl.setFZt(QpztEnum.syz.getInfo());
  61 + wHyyqjl.setFZt(QpztEnum.syz.getCode());
62 62 wHyyqjl.setFAjid(ajId);
63 63 wHyyqjl.setFAzczid(wYgxx.getFSsczid());
64 64 wHyyqjl.setFAzczmc(wYgxx.getFSsczmc());
... ... @@ -89,12 +89,12 @@ public class MHyyqjlManagerImpl extends BaseManagerImpl&lt;MHyyqjlDao, WHyyqjl&gt; imp
89 89 */
90 90 private List<WHyyqjl> handlerOldhyyqjl(WQpssxx wQpssxx, WYgxx wYgxx, String now_string, LocalDateTime now) {
91 91 ArrayList<String> ztList = new ArrayList<>();
92   - ztList.add(QpztEnum.syz.getInfo());
93   - ztList.add(QpztEnum.tqz.getInfo());
  92 + ztList.add(QpztEnum.syz.getCode());
  93 + ztList.add(QpztEnum.tqz.getCode());
94 94 List<WHyyqjl> list = this.list(Wrappers.<WHyyqjl>lambdaQuery().eq(WHyyqjl::getFQpid, wQpssxx.getFQpid()).in(WHyyqjl::getFZt, ztList).orderByDesc(WHyyqjl::getFCjsj));
95 95 if (CollectionUtils.isNotEmpty(list)) {
96 96 for (WHyyqjl wHyyqjl : list) {
97   - wHyyqjl.setFZt(QpztEnum.ygh.getInfo());
  97 + wHyyqjl.setFZt(QpztEnum.ygh.getCode());
98 98 wHyyqjl.setFJssysj(now_string);
99 99 wHyyqjl.setFXgsj(now);
100 100 wHyyqjl.setFXgr(wYgxx.getFXm());
... ... @@ -103,7 +103,7 @@ public class MHyyqjlManagerImpl extends BaseManagerImpl&lt;MHyyqjlDao, WHyyqjl&gt; imp
103 103 List<WTqgl> wTqgls = mTqglManager.list(Wrappers.<WTqgl>lambdaQuery().in(WTqgl::getFHyyqjlid, list.stream().map(a -> a.getId()).collect(Collectors.toList())));
104 104 if (CollectionUtils.isNotEmpty(wTqgls)) {
105 105 for (WTqgl wTqgl : wTqgls) {
106   - wTqgl.setFZt(QpztEnum.yhs.getInfo());
  106 + wTqgl.setFZt(QpztEnum.yhs.getCode());
107 107 wTqgl.setFQplzid(wQpssxx.getFQplzid());
108 108 wTqgl.setFSjhsczid(wYgxx.getFSsczid());
109 109 wTqgl.setFSjhsczmc(wYgxx.getFSsczmc());
... ...
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MQpssxxManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -135,7 +135,7 @@ public class MQpssxxManagerImpl extends BaseManagerImpl&lt;MQpssxxDao, WQpssxx&gt; imp
135 135  
136 136 @Override
137 137 public void getCzxx() {
138   - List<WQpssxx> wQpssxxes = baseMapper.selectList(Wrappers.<WQpssxx>lambdaQuery().eq(WQpssxx::getFCtzt, QpztEnum.kp.getInfo()).eq(WQpssxx::getFCyzlx, QpcyzlxEnum.cz.getInfo()));
  138 + List<WQpssxx> wQpssxxes = baseMapper.selectList(Wrappers.<WQpssxx>lambdaQuery().eq(WQpssxx::getFCtzt, QpztEnum.kp.getCode()).eq(WQpssxx::getFCyzlx, QpcyzlxEnum.cz.getCode()));
139 139 if (ObjectUtil.isNotEmpty(wQpssxxes)) {
140 140 List<String> qpIdList = wQpssxxes.stream().map(a -> a.getFQpid()).collect(Collectors.toList());
141 141 log.info("qpIdList={}", qpIdList);
... ... @@ -234,7 +234,7 @@ public class MQpssxxManagerImpl extends BaseManagerImpl&lt;MQpssxxDao, WQpssxx&gt; imp
234 234 if (wQpssxx != null) {
235 235 QpssxxDto qpssxxDto = new QpssxxDto();
236 236 wQpssxx.setFZqbh(UniqueIdUtil.getSuid());
237   - wQpssxx.setFCtzt(QpztEnum.mp.getInfo());
  237 + wQpssxx.setFCtzt(QpztEnum.mp.getCode());
238 238 wQpssxx.setFGxsj(LocalDateTime.now());
239 239 BeanUtil.copyProperties(wQpssxx, qpssxxDto);
240 240 qpssxxDto.setFLzmc(QplzjdmcEnum.qpcz.getInfo());
... ... @@ -250,11 +250,11 @@ public class MQpssxxManagerImpl extends BaseManagerImpl&lt;MQpssxxDao, WQpssxx&gt; imp
250 250 */
251 251 private void tqglHandler(WQpssxx wQpssxx, WQplz wQplz) {
252 252 log.info("退气处理：wQpssxx={},wQplz={}", wQpssxx, wQplz);
253   - if (!QpcyzlxEnum.hy.getInfo().equals(wQpssxx.getFCyzlx())) {
254   - List<WTqgl> list = wTqglManager.list(Wrappers.<WTqgl>lambdaQuery().eq(WTqgl::getFQptm, wQpssxx.getFQptm()).eq(WTqgl::getFZt, QpztEnum.dhs.getInfo()));
  253 + if (!QpcyzlxEnum.hy.getCode().equals(wQpssxx.getFCyzlx())) {
  254 + List<WTqgl> list = wTqglManager.list(Wrappers.<WTqgl>lambdaQuery().eq(WTqgl::getFQptm, wQpssxx.getFQptm()).eq(WTqgl::getFZt, QpztEnum.dhs.getCode()));
255 255 if (CollectionUtils.isNotEmpty(list)) {
256 256 WTqgl wTqgl = list.get(0);
257   - wTqgl.setFZt(QpztEnum.yhs.getInfo());
  257 + wTqgl.setFZt(QpztEnum.yhs.getCode());
258 258 wTqgl.setFQplzid(wQplz.getId());
259 259 WCzxx wczxx = wCzxxManager.getById(wQplz.getFCyczid());
260 260 if (wczxx != null) {
... ... @@ -270,15 +270,15 @@ public class MQpssxxManagerImpl extends BaseManagerImpl&lt;MQpssxxDao, WQpssxx&gt; imp
270 270 wTqglManager.updateById(wTqgl);
271 271 WHyyqjl wHyyqjl = wHyyqjlManager.getById(wTqgl.getFHyyqjlid());
272 272 if (wHyyqjl != null) {
273   - wHyyqjl.setFZt(QpztEnum.ygh.getInfo());
  273 + wHyyqjl.setFZt(QpztEnum.ygh.getCode());
274 274 wHyyqjl.setFJssysj(wQplz.getFCzsj());
275 275 wHyyqjlManager.updateById(wHyyqjl);
276 276 }
277 277 }
278   - List<WHyyqjl> otherData = wHyyqjlManager.list(Wrappers.<WHyyqjl>lambdaQuery().eq(WHyyqjl::getFQptm, wQpssxx.getFQptm()).eq(WHyyqjl::getFZt, QpztEnum.syz.getInfo()));
  278 + List<WHyyqjl> otherData = wHyyqjlManager.list(Wrappers.<WHyyqjl>lambdaQuery().eq(WHyyqjl::getFQptm, wQpssxx.getFQptm()).eq(WHyyqjl::getFZt, QpztEnum.syz.getCode()));
279 279 if (CollectionUtils.isNotEmpty(otherData)) {
280 280 for (WHyyqjl otherDatum : otherData) {
281   - otherDatum.setFZt(QpztEnum.ygh.getInfo());
  281 + otherDatum.setFZt(QpztEnum.ygh.getCode());
282 282 otherDatum.setFJssysj(wQplz.getFCzsj());
283 283 }
284 284 wHyyqjlManager.saveOrUpdateBatch(otherData);
... ...
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MQpxxManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -395,7 +395,7 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
395 395 wQpxx1.setFSsczmc(wYgxx.getFSsczmc());
396 396 wQpxx1.setFHyyhid(null);
397 397 wQpxx1.setFHyxm(null);
398   - wQpxx1.setFQpgslx(QpcyzlxEnum.cz.getInfo());
  398 + wQpxx1.setFQpgslx(QpcyzlxEnum.cz.getCode());
399 399 wQpxx1.setFQptm(qptm);
400 400 wQpxx1.setFZzrq(qpBaseInfo1.getFMakeDate());
401 401 wQpxx1.setFQpzl(qpBaseInfo1.getFZlMc());
... ... @@ -425,7 +425,7 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
425 425 qpssxxDto.setFCzr(ContextUtil.getCurrentUser().getFullname());
426 426 qpssxxDto.setFJd(wczxx != null ? wczxx.getFJd() : null);
427 427 qpssxxDto.setFWd(wczxx != null ? wczxx.getFWd() : null);
428   - qpssxxDto.setFCyzlx(QpcyzlxEnum.cz.getInfo());
  428 + qpssxxDto.setFCyzlx(QpcyzlxEnum.cz.getCode());
429 429 qpssxxDto.setFCyczid(wQpxx1.getFSsczid());
430 430 qpssxxDto.setFCyyhid(null);
431 431 qpssxxDto.setFDqsf(wczxx != null ? wczxx.getFSssf() : null);
... ... @@ -440,7 +440,7 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
440 440 }
441 441  
442 442 private void kpck_mpck_check(ArrayList<String> orgIdList, WQpssxx wQpssxx) {
443   - if (!QpcyzlxEnum.cz.getInfo().equals(wQpssxx.getFCyzlx())) {
  443 + if (!QpcyzlxEnum.cz.getCode().equals(wQpssxx.getFCyzlx())) {
444 444 throw new RuntimeException("气瓶不在厂站，无法出库");
445 445 }
446 446 if (!orgIdList.contains(wQpssxx.getFCyczid())) {
... ... @@ -449,10 +449,10 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
449 449 }
450 450  
451 451 private void kprk_mprk_check(ArrayList<String> orgIdList, WQpssxx wQpssxx) {
452   - if (!QpcyzlxEnum.cl.getInfo().equals(wQpssxx.getFCyzlx()) && !QpcyzlxEnum.yg.getInfo().equals(wQpssxx.getFCyzlx())) {
  452 + if (!QpcyzlxEnum.cl.getCode().equals(wQpssxx.getFCyzlx()) && !QpcyzlxEnum.yg.getCode().equals(wQpssxx.getFCyzlx())) {
453 453 throw new RuntimeException("气瓶不在车辆或员工手中，无法入库");
454 454 }
455   - if (QpcyzlxEnum.cl.getInfo().equals(wQpssxx.getFCyzlx())) {
  455 + if (QpcyzlxEnum.cl.getCode().equals(wQpssxx.getFCyzlx())) {
456 456 WClxx wClxx = wClxxDao.selectById(wQpssxx.getFCyclID());
457 457 if (wClxx == null) {
458 458 throw new RuntimeException("气瓶持有者车辆信息不存在");
... ... @@ -461,7 +461,7 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
461 461 throw new RuntimeException("气瓶持有者车辆信息不属于用户当前组织");
462 462 }
463 463 }
464   - if (QpcyzlxEnum.yg.getInfo().equals(wQpssxx.getFCyzlx())) {
  464 + if (QpcyzlxEnum.yg.getCode().equals(wQpssxx.getFCyzlx())) {
465 465 WYgxx one = wCurrentInfoManager.getCurrentWygxxByUserId(wQpssxx.getFCyyhid());
466 466 if (one == null) {
467 467 throw new RuntimeException("气瓶持有者员工信息不存在");
... ... @@ -486,24 +486,24 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
486 486 }
487 487  
488 488 private void kplq_mplq_check(ArrayList<String> orgIdList, WQpssxx wQpssxx, String lx, WQpxx wQpxx) {
489   - if (!QpcyzlxEnum.cz.getInfo().equals(wQpssxx.getFCyzlx())) {
  489 + if (!QpcyzlxEnum.cz.getCode().equals(wQpssxx.getFCyzlx())) {
490 490 throw new RuntimeException("气瓶不在厂站，无法领取");
491 491 }
492 492 if (!orgIdList.contains(wQpssxx.getFCyczid())) {
493 493 throw new RuntimeException("气瓶不在厂站，无法领取");
494 494 }
495   - if (QpczlxEnum.mplq.getCode().equals(lx) && QpztEnum.kp.getInfo().equals(wQpssxx.getFCtzt())) {
  495 + if (QpczlxEnum.mplq.getCode().equals(lx) && QpztEnum.kp.getCode().equals(wQpssxx.getFCtzt())) {
496 496 if (enable) {
497 497 wQpssxx = wQpssxxManager.getQpczxx(wQpxx, wQpssxx);
498 498 }
499   - if (QpztEnum.kp.getInfo().equals(wQpssxx.getFCtzt())) {
  499 + if (QpztEnum.kp.getCode().equals(wQpssxx.getFCtzt())) {
500 500 throw new RuntimeException("气瓶条码：" + wQpxx.getFQptm() + "，为空瓶，不可满瓶领取");
501 501 }
502 502 }
503 503 }
504 504  
505 505 private void kphs_mphs_check(WQpssxx wQpssxx, WDd wDd) {
506   - if (!QpcyzlxEnum.hy.getInfo().equals(wQpssxx.getFCyzlx())) {
  506 + if (!QpcyzlxEnum.hy.getCode().equals(wQpssxx.getFCyzlx())) {
507 507 throw new RuntimeException("气瓶不属于此会员，无法回收");
508 508 }
509 509 if (wDd != null) {
... ... @@ -516,22 +516,22 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
516 516 private void mpfc_check(ArrayList<String> orgIdList, WYgxx wYgxx, WQpssxx wQpssxx, WDd wDd) {
517 517 if (wDd != null) {
518 518 String fPsfs = wDd.getFPsfs();
519   - if (DdpsfsEnum.zt.getInfo().equals(fPsfs)) {
520   - if (!QpcyzlxEnum.cz.getInfo().equals(wQpssxx.getFCyzlx())) {
  519 + if (DdpsfsEnum.zt.getCode().equals(fPsfs)) {
  520 + if (!QpcyzlxEnum.cz.getCode().equals(wQpssxx.getFCyzlx())) {
521 521 throw new RuntimeException("气瓶不在厂站，无法发出");
522 522 }
523 523 if (!orgIdList.contains(wQpssxx.getFCyczid())) {
524 524 throw new RuntimeException("气瓶实时厂站与员工当前组织不一致，无法发出");
525 525 }
526 526 }
527   - if (DdpsfsEnum.ps.getInfo().equals(fPsfs)) {
528   - if (!QpcyzlxEnum.yg.getInfo().equals(wQpssxx.getFCyzlx())) {
  527 + if (DdpsfsEnum.ps.getCode().equals(fPsfs)) {
  528 + if (!QpcyzlxEnum.yg.getCode().equals(wQpssxx.getFCyzlx())) {
529 529 throw new RuntimeException("员工未领取气瓶，无法发出");
530 530 }
531 531 if (!wYgxx.getFUserid().equals(wQpssxx.getFCyyhid())) {
532 532 throw new RuntimeException("员工未领取气瓶，无法发出");
533 533 }
534   - if (QpztEnum.kp.getInfo().equals(wQpssxx.getFCtzt())) {
  534 + if (QpztEnum.kp.getCode().equals(wQpssxx.getFCtzt())) {
535 535 throw new RuntimeException("空瓶无法发出");
536 536 }
537 537 }
... ... @@ -544,13 +544,13 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
544 544 IUser currentUser = script.getCurrentUser();
545 545 WYgxx wygxx = wCurrentInfoManager.getCurrentWygxxByUserId(currentUser.getUserId());
546 546 if (wygxx != null) {
547   - if (YglxEnum.czyg.getInfo().equals(wygxx.getFSslx())) {
  547 + if (YglxEnum.czyg.getCode().equals(wygxx.getFSslx())) {
548 548 rylx = YglxEnum.czyg.getCode();
549 549 if (StringUtil.isEmpty(qyId) && StringUtil.isEmpty(qzId)) {
550 550 qzId = wygxx.getFSsczid();
551 551 }
552 552 }
553   - if (YglxEnum.qyyg.getInfo().equals(wygxx.getFSslx())) {
  553 + if (YglxEnum.qyyg.getCode().equals(wygxx.getFSslx())) {
554 554 rylx = YglxEnum.qyyg.getCode();
555 555 if (StringUtil.isEmpty(qyId)) {
556 556 qyId = wygxx.getFSsqyid();
... ... @@ -566,9 +566,9 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
566 566 map.put("qzmc", v.get(0).getFSsczmc());
567 567 map.put("qzid", v.get(0).getFSsczid());
568 568 //本厂站气瓶还在本厂站的气瓶
569   - List<QpdtVo> typeone_collect = v.stream().filter(a -> a.getFSsczid().equals(a.getFCyczID()) && "厂站".equals(a.getFCyzlx())).collect(Collectors.toList());
  569 + List<QpdtVo> typeone_collect = v.stream().filter(a -> a.getFSsczid().equals(a.getFCyczID()) && QpcyzlxEnum.cz.getCode().equals(a.getFCyzlx())).collect(Collectors.toList());
570 570 //本厂站气瓶不在本厂站的气瓶（在会员手中或者在其他厂站中）
571   - List<QpdtVo> typetwo_collect = v.stream().filter(a -> "会员".equals(a.getFCyzlx()) || !a.getFSsczid().equals(a.getFCyczID())).collect(Collectors.toList());
  571 + List<QpdtVo> typetwo_collect = v.stream().filter(a -> QpcyzlxEnum.hy.getCode().equals(a.getFCyzlx()) || !a.getFSsczid().equals(a.getFCyczID())).collect(Collectors.toList());
572 572 typetwoHandler(typetwo_collect);
573 573 //其他厂站在本厂站的气瓶
574 574 List<QpdtVo> typethree_collect = getTypethreeCollect(k);
... ... @@ -591,7 +591,7 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
591 591 QpssxxDto qpssxxDto = new QpssxxDto();
592 592 BeanUtil.copyProperties(wQpssxx, qpssxxDto);
593 593 qpssxxDto.setFZqbh(UniqueIdUtil.getSuid());
594   - qpssxxDto.setFCtzt(QpztEnum.mp.getInfo());
  594 + qpssxxDto.setFCtzt(QpztEnum.mp.getCode());
595 595 qpssxxDto.setFLzmc(QplzjdmcEnum.qpcz.getInfo());
596 596 wQpssxxManager.createOrUpdate(qpssxxDto);
597 597 }
... ... @@ -619,18 +619,18 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
619 619 if (wqpssxx == null) {
620 620 throw new RuntimeException("气瓶条码：" + qptm + "，气瓶实时信息不存在");
621 621 }
622   - if (QpztEnum.kp.getInfo().equals(wqpssxx.getFCtzt())) {
  622 + if (QpztEnum.kp.getCode().equals(wqpssxx.getFCtzt())) {
623 623 wqpssxx = wQpssxxManager.getQpczxx(wQpxx, wqpssxx);
624   - if (QpztEnum.kp.getInfo().equals(wqpssxx.getFCtzt())) {
  624 + if (QpztEnum.kp.getCode().equals(wqpssxx.getFCtzt())) {
625 625 throw new RuntimeException("气瓶条码：" + qptm + "，为空瓶，不可满瓶领取");
626 626 }
627 627 }
628 628 }
629 629 }
630   - qplzcz(mp, QpztEnum.mp.getInfo(), wygxx, now, QplzjdmcEnum.sqglmp.getInfo(), QpcyzlxEnum.yg.getInfo(), wygxx.getFUserid());
  630 + qplzcz(mp, QpztEnum.mp.getCode(), wygxx, now, QplzjdmcEnum.sqglmp.getInfo(), QpcyzlxEnum.yg.getCode(), wygxx.getFUserid());
631 631 }
632 632 if (CollectionUtils.isNotEmpty(kp)) {
633   - qplzcz(kp, QpztEnum.kp.getInfo(), wygxx, now, QplzjdmcEnum.sqglkp.getInfo(), QpcyzlxEnum.yg.getInfo(), wygxx.getFUserid());
  633 + qplzcz(kp, QpztEnum.kp.getCode(), wygxx, now, QplzjdmcEnum.sqglkp.getInfo(), QpcyzlxEnum.yg.getCode(), wygxx.getFUserid());
634 634 }
635 635 }
636 636  
... ... @@ -642,7 +642,7 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
642 642 }
643 643 QpxxVo qpxxVo = this.getQpxxByid(wQpxx.getId());
644 644 WQpssxx qpssxx = qpxxVo.getQpssxx();
645   - if (qpssxx != null && QpcyzlxEnum.hy.getInfo().equals(qpssxx.getFCyzlx())) {
  645 + if (qpssxx != null && QpcyzlxEnum.hy.getCode().equals(qpssxx.getFCyzlx())) {
646 646 List<WDdpsxq> list = wDdpsxqManager.list(Wrappers.<WDdpsxq>lambdaQuery().eq(WDdpsxq::getFQpid, wQpxx.getId()).orderByDesc(WDdpsxq::getFCjsj));
647 647 if (CollectionUtils.isNotEmpty(list)) {
648 648 WDdpsxq wDdpsxq = list.get(0);
... ... @@ -698,24 +698,24 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
698 698  
699 699 //获取员工所在厂站类型，根据数据来操作气瓶信息
700 700 String czlx = wCzxx.getFCzlx();
701   - if (!CzlxEnum.czz.getInfo().equals(czlx) && !CzlxEnum.gyz.getInfo().equals(czlx)) {
  701 + if (!CzlxEnum.czz.getCode().equals(czlx) && !CzlxEnum.gyz.getCode().equals(czlx)) {
702 702 throw new RuntimeException("厂站类型有误");
703 703 }
704 704 if (enable) {
705 705 synQpData(mprk, kprk, wYgxx, wCzxx);
706 706 }
707 707 LocalDateTime now = LocalDateTime.now();
708   - if (CzlxEnum.czz.getInfo().equals(czlx)) {
709   - qplzcz(kpck, QpztEnum.kp.getInfo(), wYgxx, now, QplzjdmcEnum.kphsgyz.getInfo(), QpcyzlxEnum.cl.getInfo(), qpInAndOutCzDTO.getClId());
710   - qplzcz(mpck, QpztEnum.mp.getInfo(), wYgxx, now, QplzjdmcEnum.mpcz.getInfo(), QpcyzlxEnum.cl.getInfo(), qpInAndOutCzDTO.getClId());
711   - qplzcz(kprk, QpztEnum.kp.getInfo(), wYgxx, now, QplzjdmcEnum.czzkphs.getInfo(), QpcyzlxEnum.cz.getInfo(), wCzxx.getId());
712   - qplzcz(mprk, QpztEnum.mp.getInfo(), wYgxx, now, QplzjdmcEnum.czzmprk.getInfo(), QpcyzlxEnum.cz.getInfo(), wCzxx.getId());
713   - }
714   - if (CzlxEnum.gyz.getInfo().equals(czlx)) {
715   - qplzcz(kpck, QpztEnum.kp.getInfo(), wYgxx, now, QplzjdmcEnum.kpcz.getInfo(), QpcyzlxEnum.cl.getInfo(), qpInAndOutCzDTO.getClId());
716   - qplzcz(mpck, QpztEnum.mp.getInfo(), wYgxx, now, QplzjdmcEnum.mpcz.getInfo(), QpcyzlxEnum.cl.getInfo(), qpInAndOutCzDTO.getClId());
717   - qplzcz(kprk, QpztEnum.kp.getInfo(), wYgxx, now, QplzjdmcEnum.kphsgyz.getInfo(), QpcyzlxEnum.cz.getInfo(), wCzxx.getId());
718   - qplzcz(mprk, QpztEnum.mp.getInfo(), wYgxx, now, QplzjdmcEnum.gyzmprk.getInfo(), QpcyzlxEnum.cz.getInfo(), wCzxx.getId());
  708 + if (CzlxEnum.czz.getCode().equals(czlx)) {
  709 + qplzcz(kpck, QpztEnum.kp.getCode(), wYgxx, now, QplzjdmcEnum.kphsgyz.getInfo(), QpcyzlxEnum.cl.getCode(), qpInAndOutCzDTO.getClId());
  710 + qplzcz(mpck, QpztEnum.mp.getCode(), wYgxx, now, QplzjdmcEnum.mpcz.getInfo(), QpcyzlxEnum.cl.getCode(), qpInAndOutCzDTO.getClId());
  711 + qplzcz(kprk, QpztEnum.kp.getCode(), wYgxx, now, QplzjdmcEnum.czzkphs.getInfo(), QpcyzlxEnum.cz.getCode(), wCzxx.getId());
  712 + qplzcz(mprk, QpztEnum.mp.getCode(), wYgxx, now, QplzjdmcEnum.czzmprk.getInfo(), QpcyzlxEnum.cz.getCode(), wCzxx.getId());
  713 + }
  714 + if (CzlxEnum.gyz.getCode().equals(czlx)) {
  715 + qplzcz(kpck, QpztEnum.kp.getCode(), wYgxx, now, QplzjdmcEnum.kpcz.getInfo(), QpcyzlxEnum.cl.getCode(), qpInAndOutCzDTO.getClId());
  716 + qplzcz(mpck, QpztEnum.mp.getCode(), wYgxx, now, QplzjdmcEnum.mpcz.getInfo(), QpcyzlxEnum.cl.getCode(), qpInAndOutCzDTO.getClId());
  717 + qplzcz(kprk, QpztEnum.kp.getCode(), wYgxx, now, QplzjdmcEnum.kphsgyz.getInfo(), QpcyzlxEnum.cz.getCode(), wCzxx.getId());
  718 + qplzcz(mprk, QpztEnum.mp.getCode(), wYgxx, now, QplzjdmcEnum.gyzmprk.getInfo(), QpcyzlxEnum.cz.getCode(), wCzxx.getId());
719 719 }
720 720 }
721 721  
... ... @@ -739,7 +739,7 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
739 739 mp_remove.add(qptm);
740 740 continue;
741 741 }
742   - WQpssxx wQpssxx = structureQpxx(qptm, wYgxx, qpBaseInfo, wQpxx, wCzxx, QpztEnum.mp.getInfo());
  742 + WQpssxx wQpssxx = structureQpxx(qptm, wYgxx, qpBaseInfo, wQpxx, wCzxx, QpztEnum.mp.getCode());
743 743 wQpssxx = wQpssxxManager.getQpczxx(wQpxx, wQpssxx);
744 744 }
745 745 }
... ... @@ -756,7 +756,7 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
756 756 kp_remove.add(qptm);
757 757 continue;
758 758 }
759   - WQpssxx wQpssxx = structureQpxx(qptm, wYgxx, qpBaseInfo, wQpxx, wCzxx, QpztEnum.kp.getInfo());
  759 + WQpssxx wQpssxx = structureQpxx(qptm, wYgxx, qpBaseInfo, wQpxx, wCzxx, QpztEnum.kp.getCode());
760 760 wQpssxx = wQpssxxManager.getQpczxx(wQpxx, wQpssxx);
761 761 }
762 762 }
... ... @@ -775,7 +775,7 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
775 775 List<WQpxx> wQpxxList = baseMapper.listScrapQp();
776 776 if (CollectionUtils.isNotEmpty(wQpxxList)) {
777 777 for (WQpxx wQpxx : wQpxxList) {
778   - wQpxx.setFZt("报废");
  778 + wQpxx.setFZt(QpztEnum.bf.getInfo());
779 779 }
780 780 this.saveOrUpdateBatch(wQpxxList);
781 781 }
... ... @@ -861,7 +861,7 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
861 861 map.put("type", "qp");
862 862 map.put("code", code);
863 863 }
864   - List<WYgxx> list = mYgxxManager.list(Wrappers.<WYgxx>lambdaQuery().eq(WYgxx::getfYgbh, code));
  864 + List<WYgxx> list = mYgxxManager.list(Wrappers.<WYgxx>lambdaQuery().eq(WYgxx::getfEwm, code));
865 865 if (ObjectUtils.isNotEmpty(list)) {
866 866 map.put("type", "yg");
867 867 map.put("code", code);
... ... @@ -1123,7 +1123,7 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
1123 1123 qpssxxDto.setFDqq(wCzxx.getFSsq());
1124 1124 qpssxxDto.setFDqjd(wCzxx.getFSsjd());
1125 1125 qpssxxDto.setFDqxxdz(wCzxx.getFXxdz());
1126   - qpssxxDto.setFCtzt(QpztEnum.mp.getInfo());
  1126 + qpssxxDto.setFCtzt(QpztEnum.mp.getCode());
1127 1127 qpssxxDto.setFQptm(wQpxx.getFQptm());
1128 1128 wQpssxxManager.createOrUpdate(qpssxxDto);
1129 1129 }
... ... @@ -1185,13 +1185,13 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
1185 1185 throw new RuntimeException("气瓶信息未传入");
1186 1186 }
1187 1187 ArrayList<QpxxDTO> qpxxDTOS = getQpxxDTOS(mplqList, wYgxx, wczxx, QpczlxEnum.mplq.getCode());
1188   - qplzcz_new(qpxxDTOS, QpztEnum.mp.getInfo(), wYgxx, now, QplzjdmcEnum.sqglmp.getInfo(), QpcyzlxEnum.yg.getInfo(), wYgxx.getFUserid());
  1188 + qplzcz_new(qpxxDTOS, QpztEnum.mp.getCode(), wYgxx, now, QplzjdmcEnum.sqglmp.getInfo(), QpcyzlxEnum.yg.getCode(), wYgxx.getFUserid());
1189 1189 } else if (QpczlxEnum.kplq.getCode().equals(qpczDTO.getCzlx())) {
1190 1190 if (ObjectUtil.isEmpty(kplqList)) {
1191 1191 throw new RuntimeException("气瓶信息未传入");
1192 1192 }
1193 1193 ArrayList<QpxxDTO> qpxxDTOS = getQpxxDTOS(kplqList, wYgxx, wczxx, QpczlxEnum.kplq.getCode());
1194   - qplzcz_new(qpxxDTOS, QpztEnum.kp.getInfo(), wYgxx, now, QplzjdmcEnum.kphssqg.getInfo(), QpcyzlxEnum.yg.getInfo(), wYgxx.getFUserid());
  1194 + qplzcz_new(qpxxDTOS, QpztEnum.kp.getCode(), wYgxx, now, QplzjdmcEnum.kphssqg.getInfo(), QpcyzlxEnum.yg.getCode(), wYgxx.getFUserid());
1195 1195 } else if (QpczlxEnum.rk.getCode().equals(qpczDTO.getCzlx())) {
1196 1196 if (ObjectUtil.isEmpty(qpczDTO.getCzId())) {
1197 1197 throw new RuntimeException("请传入厂站信息");
... ... @@ -1209,11 +1209,11 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
1209 1209 }
1210 1210 if (ObjectUtil.isNotEmpty(mprkList)) {
1211 1211 ArrayList<QpxxDTO> qpxxDTOS = getQpxxDTOS(mprkList, wYgxx, wczxx, QpczlxEnum.mprk.getCode());
1212   - qplzcz_new(qpxxDTOS, QpztEnum.mp.getInfo(), wYgxx, now, CzlxEnum.czz.getInfo().equals(wczxx.getFCzlx()) ? QplzjdmcEnum.czzmprk.getInfo() : QplzjdmcEnum.gyzmprk.getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId());
  1212 + qplzcz_new(qpxxDTOS, QpztEnum.mp.getCode(), wYgxx, now, CzlxEnum.czz.getCode().equals(wczxx.getFCzlx()) ? QplzjdmcEnum.czzmprk.getInfo() : QplzjdmcEnum.gyzmprk.getInfo(), QpcyzlxEnum.cz.getCode(), wczxx.getId());
1213 1213 }
1214 1214 if (ObjectUtil.isNotEmpty(kprkList)) {
1215 1215 ArrayList<QpxxDTO> qpxxDTOS = getQpxxDTOS(kprkList, wYgxx, wczxx, QpczlxEnum.kprk.getCode());
1216   - qplzcz_new(qpxxDTOS, QpztEnum.kp.getInfo(), wYgxx, now, CzlxEnum.czz.getInfo().equals(wczxx.getFCzlx()) ? QplzjdmcEnum.czzkphs.getInfo() : QplzjdmcEnum.kphsgyz.getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId());
  1216 + qplzcz_new(qpxxDTOS, QpztEnum.kp.getCode(), wYgxx, now, CzlxEnum.czz.getCode().equals(wczxx.getFCzlx()) ? QplzjdmcEnum.czzkphs.getInfo() : QplzjdmcEnum.kphsgyz.getInfo(), QpcyzlxEnum.cz.getCode(), wczxx.getId());
1217 1217 }
1218 1218 if (ObjectUtil.isEmpty(mprkList) && ObjectUtil.isEmpty(kprkList)) {
1219 1219 throw new RuntimeException("请传入气瓶信息");
... ... @@ -1237,11 +1237,11 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
1237 1237 }
1238 1238 if (ObjectUtil.isNotEmpty(mpckList)) {
1239 1239 ArrayList<QpxxDTO> qpxxDTOS = getQpxxDTOS(mpckList, wYgxx, wczxx, QpczlxEnum.ck.getCode());
1240   - qplzcz_new(qpxxDTOS, QpztEnum.mp.getInfo(), wYgxx, now, QplzjdmcEnum.mpcz.getInfo(), QpcyzlxEnum.cl.getInfo(), wClxx.getId());
  1240 + qplzcz_new(qpxxDTOS, QpztEnum.mp.getCode(), wYgxx, now, QplzjdmcEnum.mpcz.getInfo(), QpcyzlxEnum.cl.getCode(), wClxx.getId());
1241 1241 }
1242 1242 if (ObjectUtil.isNotEmpty(kpckList)) {
1243 1243 ArrayList<QpxxDTO> qpxxDTOS = getQpxxDTOS(kpckList, wYgxx, wczxx, QpczlxEnum.ck.getCode());
1244   - qplzcz_new(qpxxDTOS, QpztEnum.kp.getInfo(), wYgxx, now, QplzjdmcEnum.kpcz.getInfo(), QpcyzlxEnum.cl.getInfo(), wClxx.getId());
  1244 + qplzcz_new(qpxxDTOS, QpztEnum.kp.getCode(), wYgxx, now, QplzjdmcEnum.kpcz.getInfo(), QpcyzlxEnum.cl.getCode(), wClxx.getId());
1245 1245 }
1246 1246 if (ObjectUtil.isEmpty(mpckList) && ObjectUtil.isEmpty(kpckList)) {
1247 1247 throw new RuntimeException("请传入气瓶信息");
... ... @@ -1269,9 +1269,9 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
1269 1269 if (wqpssxx == null) {
1270 1270 throw new RuntimeException("气瓶条码：" + wQpxx.getFQptm() + "，气瓶实时信息不存在");
1271 1271 }
1272   - if (QpztEnum.kp.getInfo().equals(wqpssxx.getFCtzt()) && QpczlxEnum.mplq.getCode().equals(czlx)) {//只有满瓶领取的时候走这一层处理
  1272 + if (QpztEnum.kp.getCode().equals(wqpssxx.getFCtzt()) && QpczlxEnum.mplq.getCode().equals(czlx)) {//只有满瓶领取的时候走这一层处理
1273 1273 wqpssxx = wQpssxxManager.getQpczxx(wQpxx, wqpssxx);
1274   - if (QpztEnum.kp.getInfo().equals(wqpssxx.getFCtzt())) {
  1274 + if (QpztEnum.kp.getCode().equals(wqpssxx.getFCtzt())) {
1275 1275 throw new RuntimeException("气瓶条码：" + wQpxx.getFQptm() + "，为空瓶，不可满瓶领取");
1276 1276 }
1277 1277 }
... ... @@ -1291,7 +1291,7 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
1291 1291 if (ObjectUtil.isEmpty(qpBaseInfo)) {
1292 1292 throw new RuntimeException("气瓶条码：" + wQpxx.getFQptm() + "，气瓶信息不存在");
1293 1293 } else {
1294   - wqpssxx = structureQpxx(wQpxx.getFQptm(), wYgxx, qpBaseInfo, wQpxx, wczxx, QpztEnum.mp.getInfo());
  1294 + wqpssxx = structureQpxx(wQpxx.getFQptm(), wYgxx, qpBaseInfo, wQpxx, wczxx, QpztEnum.mp.getCode());
1295 1295 wqpssxx = wQpssxxManager.getQpczxx(wQpxx, wqpssxx);
1296 1296 }
1297 1297 if (QpczlxEnum.mprk.getCode().equals(czlx)) {
... ... @@ -1348,11 +1348,11 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
1348 1348 throw new RuntimeException("气瓶条码：" + qptm + "，气瓶信息信息不存在");
1349 1349 }
1350 1350 wQpssxx.setFCyzlx(qpcyzlx);
1351   - if (QpcyzlxEnum.yg.getInfo().equals(qpcyzlx) || QpcyzlxEnum.hy.getInfo().equals(qpcyzlx)) {
  1351 + if (QpcyzlxEnum.yg.getCode().equals(qpcyzlx) || QpcyzlxEnum.hy.getCode().equals(qpcyzlx)) {
1352 1352 wQpssxx.setFCyyhid(qpcyzId);
1353   - } else if (QpcyzlxEnum.cz.getInfo().equals(qpcyzlx)) {
  1353 + } else if (QpcyzlxEnum.cz.getCode().equals(qpcyzlx)) {
1354 1354 wQpssxx.setFCyczid(qpcyzId);
1355   - } else if (QpcyzlxEnum.cl.getInfo().equals(qpcyzlx)) {
  1355 + } else if (QpcyzlxEnum.cl.getCode().equals(qpcyzlx)) {
1356 1356 wQpssxx.setFCyclID(qpcyzId);
1357 1357 }
1358 1358 wQpssxx.setFCtzt(qpzt);
... ... @@ -1372,11 +1372,11 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
1372 1372 WQpxx wQpxx = qpxxDTO.getWQpxx();
1373 1373 WQpssxx wQpssxx = qpxxDTO.getWQpssxx();
1374 1374 wQpssxx.setFCyzlx(qpcyzlx);
1375   - if (QpcyzlxEnum.yg.getInfo().equals(qpcyzlx) || QpcyzlxEnum.hy.getInfo().equals(qpcyzlx)) {
  1375 + if (QpcyzlxEnum.yg.getCode().equals(qpcyzlx) || QpcyzlxEnum.hy.getCode().equals(qpcyzlx)) {
1376 1376 wQpssxx.setFCyyhid(qpcyzId);
1377   - } else if (QpcyzlxEnum.cz.getInfo().equals(qpcyzlx)) {
  1377 + } else if (QpcyzlxEnum.cz.getCode().equals(qpcyzlx)) {
1378 1378 wQpssxx.setFCyczid(qpcyzId);
1379   - } else if (QpcyzlxEnum.cl.getInfo().equals(qpcyzlx)) {
  1379 + } else if (QpcyzlxEnum.cl.getCode().equals(qpcyzlx)) {
1380 1380 wQpssxx.setFCyclID(qpcyzId);
1381 1381 }
1382 1382 wQpssxx.setFCtzt(qpzt);
... ... @@ -1397,7 +1397,7 @@ public class MQpxxManagerImpl extends BaseManagerImpl&lt;MQpxxDao, WQpxx&gt; implement
1397 1397 * @return
1398 1398 */
1399 1399 private List<QpdtVo> getTypethreeCollect(String k) {
1400   - List<WQpssxx> wQpssxxList = wQpssxxManager.list(Wrappers.<WQpssxx>lambdaQuery().eq(WQpssxx::getFCyzlx, "厂站").eq(WQpssxx::getFCyczid, k));
  1400 + List<WQpssxx> wQpssxxList = wQpssxxManager.list(Wrappers.<WQpssxx>lambdaQuery().eq(WQpssxx::getFCyzlx, QpcyzlxEnum.cz.getCode()).eq(WQpssxx::getFCyczid, k));
1401 1401 List<QpdtVo> typethree_collect = new ArrayList<>();
1402 1402 for (WQpssxx wQpssxx : wQpssxxList) {
1403 1403 WQpxx wQpxx = baseMapper.selectById(wQpssxx.getFQpid());
... ...
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MStaffStatisticsManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -106,22 +106,22 @@ public class MStaffStatisticsManagerImpl implements MStaffStatisticsManager {
106 106 mpps = mQplzManager.count(Wrappers.<WQplz>lambdaQuery().between(WQplz::getFCzsj, startDate, endDate).eq(WQplz::getFCzrid, wYgxx.getFUserid()).eq(WQplz::getFLzmc, QplzjdmcEnum.smps.getInfo()));
107 107 kphs = mQplzManager.count(Wrappers.<WQplz>lambdaQuery().between(WQplz::getFCzsj, startDate, endDate).eq(WQplz::getFCzrid, wYgxx.getFUserid()).eq(WQplz::getFLzmc, QplzjdmcEnum.kphssqg.getInfo()));
108 108 mphs = mQplzManager.count(Wrappers.<WQplz>lambdaQuery().between(WQplz::getFCzsj, startDate, endDate).eq(WQplz::getFCzrid, wYgxx.getFUserid()).eq(WQplz::getFLzmc, QplzjdmcEnum.mphssqg.getInfo()));
109   - ddps = mDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).eq(WDd::getFPsrid, wYgxx.getId()).eq(WDd::getFDdly, DdlyEnum.xsxd.getInfo()));
110   - wdaz = mDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).eq(WDd::getFPsrid, wYgxx.getId()).eq(WDd::getFDdly, DdlyEnum.wdps.getInfo()));
111   - bzxd = mDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).eq(WDd::getFPsrid, wYgxx.getId()).eq(WDd::getFDdly, DdlyEnum.bzxd.getInfo()));
  109 + ddps = mDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).eq(WDd::getFPsrid, wYgxx.getId()).eq(WDd::getFDdly, DdlyEnum.xsxd.getCode()));
  110 + wdaz = mDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).eq(WDd::getFPsrid, wYgxx.getId()).eq(WDd::getFDdly, DdlyEnum.wdps.getCode()));
  111 + bzxd = mDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).eq(WDd::getFPsrid, wYgxx.getId()).eq(WDd::getFDdly, DdlyEnum.bzxd.getCode()));
112 112 count = mDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).eq(WDd::getFPsrid, wYgxx.getId()));
113   - xsxd = mDdDao.statistics(wYgxx, startDate, endDate, DdlyEnum.xsxd.getInfo(),null);
114   - wdps = mDdDao.statistics(wYgxx, startDate, endDate, DdlyEnum.wdps.getInfo(),null);
  113 + xsxd = mDdDao.statistics(wYgxx, startDate, endDate, DdlyEnum.xsxd.getCode(),null);
  114 + wdps = mDdDao.statistics(wYgxx, startDate, endDate, DdlyEnum.wdps.getCode(),null);
115 115 } else {
116 116 mpps = mQplzManager.count(Wrappers.<WQplz>lambdaQuery().between(WQplz::getFCzsj, startDate, endDate).in(WQplz::getFCyczid,orgIdList).eq(WQplz::getFLzmc, QplzjdmcEnum.smps.getInfo()));
117 117 kphs = mQplzManager.count(Wrappers.<WQplz>lambdaQuery().between(WQplz::getFCzsj, startDate, endDate).in(WQplz::getFCyczid,orgIdList).eq(WQplz::getFLzmc, QplzjdmcEnum.kphssqg.getInfo()));
118 118 mphs = mQplzManager.count(Wrappers.<WQplz>lambdaQuery().between(WQplz::getFCzsj, startDate, endDate).in(WQplz::getFCyczid,orgIdList).eq(WQplz::getFLzmc, QplzjdmcEnum.mphssqg.getInfo()));
119   - ddps = mDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).in(WDd::getFCzid,orgIdList).eq(WDd::getFDdly, DdlyEnum.xsxd.getInfo()));
120   - wdaz = mDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).in(WDd::getFCzid,orgIdList).eq(WDd::getFDdly, DdlyEnum.wdps.getInfo()));
121   - bzxd = mDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).in(WDd::getFCzid,orgIdList).eq(WDd::getFDdly, DdlyEnum.bzxd.getInfo()));
  119 + ddps = mDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).in(WDd::getFCzid,orgIdList).eq(WDd::getFDdly, DdlyEnum.xsxd.getCode()));
  120 + wdaz = mDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).in(WDd::getFCzid,orgIdList).eq(WDd::getFDdly, DdlyEnum.wdps.getCode()));
  121 + bzxd = mDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).in(WDd::getFCzid,orgIdList).eq(WDd::getFDdly, DdlyEnum.bzxd.getCode()));
122 122 count = mDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).in(WDd::getFCzid,orgIdList));
123   - xsxd = mDdDao.statistics(wYgxx, startDate, endDate, DdlyEnum.xsxd.getInfo(),orgIdList);
124   - wdps = mDdDao.statistics(wYgxx, startDate, endDate, DdlyEnum.wdps.getInfo(),orgIdList);
  123 + xsxd = mDdDao.statistics(wYgxx, startDate, endDate, DdlyEnum.xsxd.getCode(),orgIdList);
  124 + wdps = mDdDao.statistics(wYgxx, startDate, endDate, DdlyEnum.wdps.getCode(),orgIdList);
125 125 }
126 126 HashMap<String, Object> map = new HashMap<>();
127 127 map.put("mpps", mpps);
... ...
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MTqglManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -75,7 +75,7 @@ public class MTqglManagerImpl extends BaseManagerImpl&lt;MTqglDao, WTqgl&gt; implement
75 75 if (wHyyqjl == null) {
76 76 throw new RuntimeException("会员用气记录不存在");
77 77 }
78   - if (QpztEnum.ygh.equals(wHyyqjl.getFZt())) {
  78 + if (QpztEnum.ygh.getCode().equals(wHyyqjl.getFZt())) {
79 79 throw new RuntimeException("此状态下不允许提交退气");
80 80 }
81 81 List<WTqgl> wTqgls = baseMapper.selectList(Wrappers.<WTqgl>lambdaQuery().eq(WTqgl::getFHyyqjlid, id));
... ... @@ -112,9 +112,9 @@ public class MTqglManagerImpl extends BaseManagerImpl&lt;MTqglDao, WTqgl&gt; implement
112 112 wTqgl.setFWd(wdd.getFShdzwd());
113 113 }
114 114 wTqgl.setFDdid(wHyyqjl.getFDdid());
115   - wTqgl.setFZt(QpztEnum.dhs.getInfo());
  115 + wTqgl.setFZt(QpztEnum.dhs.getCode());
116 116 baseMapper.insert(wTqgl);
117   - wHyyqjl.setFZt(QpztEnum.tqz.getInfo());
  117 + wHyyqjl.setFZt(QpztEnum.tqz.getCode());
118 118 wHyyqjlManager.updateById(wHyyqjl);
119 119 }
120 120  
... ... @@ -133,7 +133,7 @@ public class MTqglManagerImpl extends BaseManagerImpl&lt;MTqglDao, WTqgl&gt; implement
133 133 if (wTqgl == null) {
134 134 throw new RuntimeException("退气信息不存在");
135 135 }
136   - wTqgl.setFZt(QpztEnum.yhs.getInfo());
  136 + wTqgl.setFZt(QpztEnum.yhs.getCode());
137 137  
138 138 QpssxxDto qpssxxDto = new QpssxxDto();
139 139 qpssxxDto.setFLzmc(QplzjdmcEnum.kphssqg.getInfo());
... ... @@ -145,9 +145,9 @@ public class MTqglManagerImpl extends BaseManagerImpl&lt;MTqglDao, WTqgl&gt; implement
145 145 if (wCzxx == null) {
146 146 throw new RuntimeException("员工当前厂站信息不存在");
147 147 }
148   - wQpssxx.setFCyzlx(QpcyzlxEnum.yg.getInfo());
  148 + wQpssxx.setFCyzlx(QpcyzlxEnum.yg.getCode());
149 149 wQpssxx.setFCyyhid(wYgxx.getFUserid());
150   - wQpssxx.setFCtzt(QpztEnum.kp.getInfo());
  150 + wQpssxx.setFCtzt(QpztEnum.kp.getCode());
151 151 wQpssxx.setFJd(wCzxx.getFJd());
152 152 wQpssxx.setFWd(wCzxx.getFWd());
153 153 wQpssxx.setFDqsf(wCzxx.getFSssf());
... ... @@ -181,8 +181,8 @@ public class MTqglManagerImpl extends BaseManagerImpl&lt;MTqglDao, WTqgl&gt; implement
181 181 }
182 182 List<String> kptm = wStaffTqglRequest.getKptm();
183 183 List<String> mptm = wStaffTqglRequest.getMptm();
184   - hs(kptm, QpztEnum.kp.getInfo(), format, wYgxx, wCzxx);
185   - hs(mptm, QpztEnum.mp.getInfo(), format, wYgxx, wCzxx);
  184 + hs(kptm, QpztEnum.kp.getCode(), format, wYgxx, wCzxx);
  185 + hs(mptm, QpztEnum.mp.getCode(), format, wYgxx, wCzxx);
186 186 }
187 187  
188 188 /**
... ... @@ -202,24 +202,24 @@ public class MTqglManagerImpl extends BaseManagerImpl&lt;MTqglDao, WTqgl&gt; implement
202 202 if (wQpssxx == null) {
203 203 throw new RuntimeException("气瓶实时信息不存在");
204 204 }
205   - if (!QpcyzlxEnum.hy.getInfo().equals(wQpssxx.getFCyzlx())) {
  205 + if (!QpcyzlxEnum.hy.getCode().equals(wQpssxx.getFCyzlx())) {
206 206 throw new RuntimeException("气瓶条码：" + wQpssxx.getFQptm() + " 实时持有者不是会员，不能执行回收操作");
207 207 }
208   - if (QpztEnum.kp.getInfo().equals(type)) {
  208 + if (QpztEnum.kp.getCode().equals(type)) {
209 209 qpssxxDto.setFLzmc(QplzjdmcEnum.kphssqg.getInfo());
210   - wQpssxx.setFCtzt(QpztEnum.kp.getInfo());
211   - } else if (QpztEnum.mp.getInfo().equals(type)) {
  210 + wQpssxx.setFCtzt(QpztEnum.kp.getCode());
  211 + } else if (QpztEnum.mp.getCode().equals(type)) {
212 212 qpssxxDto.setFLzmc(QplzjdmcEnum.mphssqg.getInfo());
213   - wQpssxx.setFCtzt(QpztEnum.mp.getInfo());
  213 + wQpssxx.setFCtzt(QpztEnum.mp.getCode());
214 214 }
215   - List<WHyyqjl> list = wHyyqjlManager.list(Wrappers.<WHyyqjl>lambdaQuery().eq(WHyyqjl::getFQptm, qptm).eq(WHyyqjl::getFZt, QpztEnum.syz.getInfo()).orderByDesc(WHyyqjl::getFCjsj));
  215 + List<WHyyqjl> list = wHyyqjlManager.list(Wrappers.<WHyyqjl>lambdaQuery().eq(WHyyqjl::getFQptm, qptm).eq(WHyyqjl::getFZt, QpztEnum.syz.getCode()).orderByDesc(WHyyqjl::getFCjsj));
216 216 log.info("会员在用气瓶，data={}", list);
217 217 for (WHyyqjl wHyyqjl : list) {
218 218 wHyyqjl.setFJssysj(format);
219   - wHyyqjl.setFZt(QpztEnum.ygh.getInfo());
  219 + wHyyqjl.setFZt(QpztEnum.ygh.getCode());
220 220 wHyyqjlManager.updateById(wHyyqjl);
221 221 }
222   - wQpssxx.setFCyzlx(QpcyzlxEnum.yg.getInfo());
  222 + wQpssxx.setFCyzlx(QpcyzlxEnum.yg.getCode());
223 223 wQpssxx.setFCyyhid(wYgxx.getFUserid());
224 224 wQpssxx.setFJd(wCzxx.getFJd());
225 225 wQpssxx.setFWd(wCzxx.getFWd());
... ...
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MYgxxManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -135,7 +135,7 @@ public class MYgxxManagerImpl extends BaseManagerImpl&lt;MYgxxDao, WYgxx&gt; implement
135 135 wYgxx.setFXm(ygxxDTO.getName());
136 136 wYgxx.setFSjh(ygxxDTO.getPhone());
137 137 wYgxx.setFRzsj(ygxxDTO.getEmploymentDate());
138   - wYgxx.setFSslx(ObjectUtils.isNotEmpty(wQyxx) ? YglxEnum.qyyg.getInfo() : YglxEnum.czyg.getInfo());
  138 + wYgxx.setFSslx(ObjectUtils.isNotEmpty(wQyxx) ? YglxEnum.qyyg.getCode() : YglxEnum.czyg.getCode());
139 139 wYgxx.setFXb(ygxxDTO.getGender());
140 140 wYgxx.setFZt(ygxxDTO.getState());
141 141 wYgxx.setFSsqymc(ObjectUtils.isNotEmpty(wQyxx) ? wQyxx.getFQymc() : wCzxx.getFSsqymc());
... ... @@ -261,14 +261,14 @@ public class MYgxxManagerImpl extends BaseManagerImpl&lt;MYgxxDao, WYgxx&gt; implement
261 261 }
262 262 if (YglxEnum.qyyg.getCode().equals(yhlx)) {
263 263 if (ObjectUtil.isNotEmpty(wYgxxes)) {
264   - if (YglxEnum.qyyg.getInfo().equals(wYgxxes.get(0).getFSslx())) {
  264 + if (YglxEnum.qyyg.getCode().equals(wYgxxes.get(0).getFSslx())) {
265 265 throw new RuntimeException("手机号已被注册");
266 266 }
267 267 throw new RuntimeException("手机号已注册厂站员工");
268 268 }
269 269 } else if (YglxEnum.czyg.getCode().equals(yhlx)) {
270 270 if (ObjectUtil.isNotEmpty(wYgxxes)) {
271   - if (YglxEnum.czyg.getInfo().equals(wYgxxes.get(0).getFSslx())) {
  271 + if (YglxEnum.czyg.getCode().equals(wYgxxes.get(0).getFSslx())) {
272 272 throw new RuntimeException("手机号已被注册");
273 273 }
274 274 throw new RuntimeException("手机号已注册企业员工");
... ... @@ -370,7 +370,7 @@ public class MYgxxManagerImpl extends BaseManagerImpl&lt;MYgxxDao, WYgxx&gt; implement
370 370 WYgxx wYgxx = baseMapper.selectById(id);
371 371 YgxxVO ygxxVO = new YgxxVO();
372 372 ygxxVO.setId(wYgxx.getId());
373   - ygxxVO.setOrgId(YglxEnum.qyyg.getInfo().equalsIgnoreCase(wYgxx.getFSslx()) ? wYgxx.getFSsqyid() : wYgxx.getFSsczid());
  373 + ygxxVO.setOrgId(YglxEnum.qyyg.getCode().equalsIgnoreCase(wYgxx.getFSslx()) ? wYgxx.getFSsqyid() : wYgxx.getFSsczid());
374 374 ygxxVO.setPhone(wYgxx.getFSjh());
375 375 ygxxVO.setName(wYgxx.getFXm());
376 376 ygxxVO.setEmploymentDate(wYgxx.getFRzsj());
... ...
backend/lpg-manage/src/main/resources/mapper/MAjMapper.xml
  Diff comments   View file @f3c368e
... ... @@ -167,10 +167,10 @@
167 167 and w_aj.F_ajzt = #{query.fAjzt}
168 168 </if>
169 169 </where>
170   - <if test="query.fAjzt == '待整改'.toString()">
  170 + <if test="query.fAjzt == 'dzg'.toString()">
171 171 order by w_aj.F_ajsj desc
172 172 </if>
173   - <if test="query.fAjzt == '已整改'.toString()">
  173 + <if test="query.fAjzt == 'yzg'.toString()">
174 174 order by w_aj.F_wxsj desc
175 175 </if>
176 176  
... ...
backend/lpg-manage/src/main/resources/mapper/MDdMapper.xml
  Diff comments   View file @f3c368e
... ... @@ -190,7 +190,7 @@
190 190 count(w_dd.F_ddly) number,
191 191 date_format(w_dd.F_sjwcsj,'%H') as dateStr
192 192 from w_dd w_dd
193   - where w_dd.F_ddzt = '已完成'
  193 + where w_dd.F_ddzt = '204'
194 194 and date_format(w_dd.F_sjwcsj,'%Y%m%d') = date_format(sysdate() ,'%Y%m%d')
195 195 and w_dd.ID_ in (select F_ddID from w_ddpsxq wd)
196 196 <if test="qyId != null and qyId != ''">
... ... @@ -234,7 +234,7 @@
234 234 count(w_dd.F_ddly) number,
235 235 date_format(w_dd.F_sjwcsj,'%Y%m%d') as dateStr
236 236 from w_dd w_dd
237   - where w_dd.F_ddzt = '已完成'
  237 + where w_dd.F_ddzt = '204'
238 238 and week(w_dd.F_sjwcsj) = week(sysdate())
239 239 and w_dd.ID_ in (select F_ddID from w_ddpsxq wd)
240 240 <if test="qyId != null and qyId != ''">
... ... @@ -278,7 +278,7 @@
278 278 count(w_dd.F_ddly) number,
279 279 date_format(w_dd.F_sjwcsj,'%Y%m%d') as dateStr
280 280 from w_dd w_dd
281   - where w_dd.F_ddzt = '已完成'
  281 + where w_dd.F_ddzt = '204'
282 282 and month(w_dd.F_sjwcsj) = month(sysdate())
283 283 and w_dd.ID_ in (select F_ddID from w_ddpsxq wd)
284 284 <if test="qyId != null and qyId != ''">
... ... @@ -316,7 +316,7 @@
316 316 count(w_dd.F_ddly) number,
317 317 month(w_dd.F_sjwcsj) as dateStr
318 318 from w_dd w_dd
319   - where w_dd.F_ddzt = '已完成'
  319 + where w_dd.F_ddzt = '204'
320 320 and year(w_dd.F_sjwcsj) = year(sysdate())
321 321 and w_dd.ID_ in (select F_ddID from w_ddpsxq wd)
322 322 <if test="qyId != null and qyId != ''">
... ... @@ -356,7 +356,7 @@
356 356 from w_dd w_dd
357 357 inner join w_ddpsxq w_ddpsxq on w_ddpsxq.F_ddID = w_dd.ID_
358 358 inner join w_qpxx w_qpxx on w_qpxx.ID_ = w_ddpsxq.F_qpID
359   - where w_dd.F_ddzt = '已完成'
  359 + where w_dd.F_ddzt = '204'
360 360 and date_format(w_dd.F_sjwcsj,'%Y%m%d') = date_format(sysdate() ,'%Y%m%d')
361 361 <if test="qyId != null and qyId != ''">
362 362 and w_dd.F_qyID = #{qyId}
... ... @@ -397,7 +397,7 @@
397 397 from w_dd w_dd
398 398 inner join w_ddpsxq w_ddpsxq on w_ddpsxq.F_ddID = w_dd.ID_
399 399 inner join w_qpxx w_qpxx on w_qpxx.ID_ = w_ddpsxq.F_qpID
400   - where w_dd.F_ddzt = '已完成'
  400 + where w_dd.F_ddzt = '204'
401 401 and week(w_dd.F_sjwcsj) = week(sysdate())
402 402 <if test="qyId != null and qyId != ''">
403 403 and w_dd.F_qyID = #{qyId}
... ... @@ -438,7 +438,7 @@
438 438 from w_dd w_dd
439 439 inner join w_ddpsxq w_ddpsxq on w_ddpsxq.F_ddID = w_dd.ID_
440 440 inner join w_qpxx w_qpxx on w_qpxx.ID_ = w_ddpsxq.F_qpID
441   - where w_dd.F_ddzt = '已完成'
  441 + where w_dd.F_ddzt = '204'
442 442 and month(w_dd.F_sjwcsj) = month(sysdate())
443 443 <if test="qyId != null and qyId != ''">
444 444 and w_dd.F_qyID = #{qyId}
... ... @@ -473,7 +473,7 @@
473 473 from w_dd w_dd
474 474 inner join w_ddpsxq w_ddpsxq on w_ddpsxq.F_ddID = w_dd.ID_
475 475 inner join w_qpxx w_qpxx on w_qpxx.ID_ = w_ddpsxq.F_qpID
476   - where w_dd.F_ddzt = '已完成'
  476 + where w_dd.F_ddzt = '204'
477 477 and year(w_dd.F_sjwcsj) = year(sysdate())
478 478 <if test="qyId != null and qyId != ''">
479 479 and w_dd.F_qyID = #{qyId}
... ... @@ -515,15 +515,7 @@
515 515 select * from w_dd w_dd
516 516 <where>
517 517 <if test="query.fDdzt != null and query.fDdzt != ''">
518   - <if test="query.fDdzt == '待配送/自提'.toString()">
519   - and w_dd.F_ddzt in ('待配送','自提')
520   - </if>
521   - <if test="query.fDdzt == '配送中'.toString()">
522   - and w_dd.F_ddzt = '配送中'
523   - </if>
524   - <if test="query.fDdzt == '已完成'.toString()">
525   - and w_dd.F_ddzt = '已完成'
526   - </if>
  518 + and w_dd.F_ddzt = #{query.fDdzt}
527 519 </if>
528 520 <if test="query.fDddh != null and query.fDddh != ''">
529 521 and (w_dd.F_dddh like concat('%',#{query.fDddh},'%') or w_dd.F_sfzh like concat('%',#{query.fDddh},'%') or w_dd.F_hymc like concat('%',#{query.fDddh},'%') or w_dd.F_hydh like concat('%',#{query.fDddh},'%') )
... ... @@ -539,11 +531,11 @@
539 531 </select>
540 532  
541 533 <select id="yearDelivery" resultType="java.lang.Integer">
542   - select count(*) from w_dd where F_czID = #{czId} and F_ddzt = '已完成' and year(F_cjsj) = year(SYSDATE())
  534 + select count(*) from w_dd where F_czID = #{czId} and F_ddzt = '204' and year(F_cjsj) = year(SYSDATE())
543 535 </select>
544 536  
545 537 <select id="monthDelivery" resultType="java.lang.Integer">
546   - select count(*) from w_dd where F_czID = #{czId} and F_ddzt = '已完成' and month(F_cjsj) = month(SYSDATE())
  538 + select count(*) from w_dd where F_czID = #{czId} and F_ddzt = '204' and month(F_cjsj) = month(SYSDATE())
547 539 </select>
548 540  
549 541 <select id="monthDeliveryOnMonth" resultType="java.lang.Double">
... ... @@ -553,13 +545,13 @@
553 545 /
554 546 sum(case when MONTH(F_cjsj) = MONTH(SYSDATE())-1 and year(F_cjsj) = year(SYSDATE()) then 1 else 0 end )
555 547 ,0),2)
556   - from w_dd where F_czID = #{czId} and F_ddzt = '已完成'
  548 + from w_dd where F_czID = #{czId} and F_ddzt = '204'
557 549 </select>
558 550  
559 551 <select id="allMonthDelivery" resultType="java.util.HashMap">
560 552 SELECT
561 553 monthStr,
562   - (select count(*) from w_dd where F_czID = #{czId} and YEAR(F_cjsj) = YEAR(SYSDATE()) and MONTH(F_cjsj) = monthStr and F_ddzt = '已完成') as monthDelivery
  554 + (select count(*) from w_dd where F_czID = #{czId} and YEAR(F_cjsj) = YEAR(SYSDATE()) and MONTH(F_cjsj) = monthStr and F_ddzt = '204') as monthDelivery
563 555 FROM
564 556 (SELECT 1 monthStr UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9 UNION ALL SELECT 10 UNION ALL SELECT 11 UNION ALL SELECT 12) t1
565 557 WHERE
... ...
backend/lpg-manage/src/main/resources/mapper/MQpssxxMapper.xml
  Diff comments   View file @f3c368e
... ... @@ -245,4 +245,31 @@
245 245 #{item}
246 246 </foreach>
247 247 </insert>
  248 +
  249 + <update id="updateQpzt_zc">
  250 + update w_qpxx
  251 + set F_zt = 'zc'
  252 + where F_zt = '正常' and id_ in
  253 + <foreach collection="list" separator="," item="item" open="(" close=")">
  254 + #{item}
  255 + </foreach>
  256 + </update>
  257 +
  258 + <update id="updateQpzt_cqwj">
  259 + update w_qpxx
  260 + set F_zt = 'cqwj'
  261 + where F_zt = '超期未检' and id_ in
  262 + <foreach collection="list" separator="," item="item" open="(" close=")">
  263 + #{item}
  264 + </foreach>
  265 + </update>
  266 +
  267 + <update id="updateQpzt_bf">
  268 + update w_qpxx
  269 + set F_zt = 'bf'
  270 + where F_zt = '报废' and id_ in
  271 + <foreach collection="list" separator="," item="item" open="(" close=")">
  272 + #{item}
  273 + </foreach>
  274 + </update>
248 275 </mapper>
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/AjController.java
  Diff comments   View file @f3c368e
... ... @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
5 5 import com.baomidou.mybatisplus.core.metadata.IPage;
6 6 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7 7 import com.hotent.base.model.CommonResult;
  8 +import com.hotent.lpg.common.enums.AjlxEnum;
  9 +import com.hotent.lpg.common.enums.AjztEnum;
8 10 import com.hotent.lpg.common.model.WAj;
9 11 import com.hotent.lpg.common.model.WAjxq;
10 12 import com.hotent.lpg.user.dto.AjDto;
... ... @@ -33,14 +35,14 @@ public class AjController {
33 35  
34 36 @GetMapping("/pageList")
35 37 @ApiOperation("会员安检列表")
36   - public CommonResult<IPage<AjxxVo>> pageList(Page page, String ajlx, String ajjl, String ajsj) {
  38 + public CommonResult<IPage<WAj>> pageList(Page page, String ajlx, String ajjl, String ajsj) {
37 39 AjDto ajDto = new AjDto();
38 40 ajDto.setFHyyhid(ContextUtil.getCurrentUserId());
39 41 ajDto.setFAjlx(ajlx);
40 42 ajDto.setFAjjl(ajjl);
41 43 ajDto.setSj(ajsj);
42   - IPage<AjxxVo> responseIPage = wAjManager.pageList(page,ajDto,null);
43   - return CommonResult.<IPage<AjxxVo>>ok().value(responseIPage);
  44 + IPage<WAj> responseIPage = wAjManager.pageList(page,ajDto,null);
  45 + return CommonResult.<IPage<WAj>>ok().value(responseIPage);
44 46 }
45 47  
46 48 /**
... ... @@ -60,6 +62,8 @@ public class AjController {
60 62 List<WAjxq> list = wAjxqManager.list(new LambdaQueryWrapper<WAjxq>().eq(WAjxq::getfAjid, id));
61 63 response.setAj(aj);
62 64 response.setAjxq(list);
  65 + aj.setFAjlx(AjlxEnum.valueOf(aj.getFAjlx()).getInfo());
  66 + aj.setFAjzt(AjztEnum.valueOf(aj.getFAjzt()).getInfo());
63 67 return CommonResult.<AjXqVo>ok().value(response);
64 68 }
65 69  
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/BxbController.java
  Diff comments   View file @f3c368e
... ... @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
6 6 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7 7 import com.hotent.base.controller.BaseController;
8 8 import com.hotent.base.model.CommonResult;
  9 +import com.hotent.lpg.common.enums.BxztEnum;
9 10 import com.hotent.lpg.common.model.WBxb;
10 11 import com.hotent.lpg.common.model.WHyxx;
11 12 import com.hotent.lpg.user.dto.BxDto;
... ... @@ -86,6 +87,7 @@ public class BxbController extends BaseController&lt;BxbManager, WBxb&gt; {
86 87 @GetMapping(value = "/bxbPage", produces = {"application/json; charset=utf-8"})
87 88 @ApiOperation(value = "会员报修列表", httpMethod = "GET", notes = "会员报修列表")
88 89 public CommonResult bxbPage(Page page, WBxb wBxb) {
  90 + wBxb.setFZt(BxztEnum.valueOf(wBxb.getFZt()).getCode());
89 91 log.info("保修列表参数，page={},wBxb={}", page, wBxb);
90 92 String currentUserId = scriptImpl.getCurrentUserId();
91 93 WHyxx wHyxx = wHyxxManager.getOne(Wrappers.<WHyxx>lambdaQuery().eq(WHyxx::getFUserid, currentUserId));
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/HyyqjlController.java
  Diff comments   View file @f3c368e
... ... @@ -41,7 +41,7 @@ public class HyyqjlController extends BaseController&lt;HyyqjlManager, WHyyqjl&gt; {
41 41 @ApiOperation(value = "会员查询用气记录", httpMethod = "GET", notes = "会员查询用气记录")
42 42 public CommonResult list(Page page, HyyqjlDto hyyqjlDto) throws Exception {
43 43 hyyqjlDto.setHyid(ContextUtil.getCurrentUserId());
44   - IPage<YhyqjlVo> data = baseService.pageList(page, hyyqjlDto);
  44 + IPage<WHyyqjl> data = baseService.pageList(page, hyyqjlDto);
45 45 return CommonResult.ok().value(data);
46 46 }
47 47  
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/QplxController.java
  Diff comments   View file @f3c368e
... ... @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
4 4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5 5 import com.hotent.base.controller.BaseController;
6 6 import com.hotent.base.model.CommonResult;
  7 +import com.hotent.lpg.common.enums.QplxztEnum;
7 8 import com.hotent.lpg.common.model.WQplx;
8 9 import com.hotent.lpg.user.manager.QplxManager;
9 10 import io.swagger.annotations.ApiOperation;
... ... @@ -25,7 +26,7 @@ public class QplxController extends BaseController&lt;QplxManager, WQplx&gt; {
25 26 @ApiOperation(value = "通过门店（厂站）获取气瓶类型列表（商品）", httpMethod = "GET", notes = "通过门店（厂站）获取气瓶类型列表（商品）")
26 27 public CommonResult<IPage<WQplx>> list(Page page, @RequestParam(required = true) String czid) throws Exception {
27 28  
28   - IPage<WQplx> list = baseService.list(page,czid,"已上架");
  29 + IPage<WQplx> list = baseService.list(page,czid, QplxztEnum.ysj.getCode());
29 30 return CommonResult.<IPage<WQplx>>ok().value(list);
30 31 }
31 32  
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/AjManager.java
  Diff comments   View file @f3c368e
... ... @@ -8,7 +8,7 @@ import com.hotent.lpg.user.dto.AjDto;
8 8 import com.hotent.lpg.user.vo.AjxxVo;
9 9  
10 10 public interface AjManager extends BaseManager<WAj> {
11   - IPage<AjxxVo> pageList(Page page, AjDto ajDto, String filterFieldSql);
  11 + IPage<WAj> pageList(Page page, AjDto ajDto, String filterFieldSql);
12 12  
13 13 WAj getDetail(String id);
14 14  
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/HyyqjlManager.java
  Diff comments   View file @f3c368e
... ... @@ -8,7 +8,7 @@ import com.hotent.lpg.user.dto.HyyqjlDto;
8 8 import com.hotent.lpg.user.vo.YhyqjlVo;
9 9  
10 10 public interface HyyqjlManager extends BaseManager<WHyyqjl> {
11   - IPage<YhyqjlVo> pageList(Page page, HyyqjlDto hyyqjlDto);
  11 + IPage<WHyyqjl> pageList(Page page, HyyqjlDto hyyqjlDto);
12 12  
13 13 Object getDetailYqjlid(String yqjlid);
14 14  
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/AjManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
6 6 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7 7 import com.hotent.base.manager.impl.BaseManagerImpl;
8 8 import com.hotent.base.util.StringUtil;
  9 +import com.hotent.lpg.common.enums.AjlxEnum;
  10 +import com.hotent.lpg.common.enums.AjztEnum;
9 11 import com.hotent.lpg.common.model.WAj;
10 12 import com.hotent.lpg.user.dao.AjDao;
11 13 import com.hotent.lpg.user.dto.AjDto;
... ... @@ -22,20 +24,20 @@ import java.util.ArrayList;
22 24 @Service
23 25 public class AjManagerImpl extends BaseManagerImpl<AjDao, WAj> implements AjManager {
24 26 @Override
25   - public IPage<AjxxVo> pageList(Page page, AjDto ajDto,String filterFieldSql) {
  27 + public IPage<WAj> pageList(Page page, AjDto ajDto,String filterFieldSql) {
26 28 ArrayList<String> ajzt = new ArrayList<>();
27   - if ("完成安检".equals(ajDto.getFAjjl())) {
28   - ajzt.add("已整改");
29   - ajzt.add("完成安检");
  29 + if (AjztEnum.wcaj.getInfo().equals(ajDto.getFAjjl())) {
  30 + ajzt.add(AjztEnum.yzg.getCode());
  31 + ajzt.add(AjztEnum.wcaj.getCode());
30 32 }
31   - if ("待整改".equals(ajDto.getFAjjl())) {
32   - ajzt.add("待整改");
  33 + if (AjztEnum.dzg.getInfo().equals(ajDto.getFAjjl())) {
  34 + ajzt.add(AjztEnum.dzg.getCode());
33 35 }
34 36 if ("随瓶".equals(ajDto.getFAjlx())) {
35   - ajDto.setFAjlx("随瓶安检");
  37 + ajDto.setFAjlx(AjlxEnum.spaj.getCode());
36 38 }
37 39 if ("定期".equals(ajDto.getFAjlx())) {
38   - ajDto.setFAjlx("定期安检");
  40 + ajDto.setFAjlx(AjlxEnum.dqaj.getCode());
39 41 }
40 42 if ("全部".equals(ajDto.getFAjjl())) {
41 43 ajDto.setFAjjl(null);
... ... @@ -51,7 +53,12 @@ public class AjManagerImpl extends BaseManagerImpl&lt;AjDao, WAj&gt; implements AjMana
51 53 .in(StringUtil.isNotEmpty(ajDto.getFAjjl()),WAj::getFAjzt, ajzt)
52 54 .orderByDesc(WAj::getFCjsj)
53 55 .apply(StringUtil.isNotEmpty(filterFieldSql), filterFieldSql);
54   - Page respIPage = this.page(page, eq);
  56 + Page<WAj> respIPage = this.page(page, eq);
  57 +
  58 + for (WAj record : respIPage.getRecords()) {
  59 + record.setFAjlx(AjlxEnum.valueOf(record.getFAjlx()).getInfo());
  60 + record.setFAjzt(AjztEnum.valueOf(record.getFAjzt()).getInfo());
  61 + }
55 62 return respIPage;
56 63 }
57 64  
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/BxbManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -136,6 +136,9 @@ public class BxbManagerImpl extends BaseManagerImpl&lt;BxbDao, WBxb&gt; implements Bxb
136 136 @Override
137 137 public IPage<BxbVo> bxbPage(Page page, WBxb wBxb) {
138 138 Page<BxbVo> result = baseMapper.bxbPage(page, wBxb);
  139 + for (BxbVo record : result.getRecords()) {
  140 + record.setFZt(BxztEnum.valueOf(record.getFZt()).getInfo());
  141 + }
139 142 return result;
140 143 }
141 144  
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/HyxxManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -9,10 +9,7 @@ import com.hotent.base.exception.BaseException;
9 9 import com.hotent.base.manager.impl.BaseManagerImpl;
10 10 import com.hotent.base.util.StringUtil;
11 11 import com.hotent.base.util.time.DateFormatUtil;
12   -import com.hotent.lpg.common.enums.QpztEnum;
13   -import com.hotent.lpg.common.enums.RzztEnum;
14   -import com.hotent.lpg.common.enums.SfztEnum;
15   -import com.hotent.lpg.common.enums.UserlxEnum;
  12 +import com.hotent.lpg.common.enums.*;
16 13 import com.hotent.lpg.common.model.*;
17 14 import com.hotent.lpg.common.vo.HytjxxVO;
18 15 import com.hotent.lpg.user.dao.CzxxDao;
... ... @@ -78,8 +75,8 @@ public class HyxxManagerImpl extends BaseManagerImpl&lt;HyxxDao, WHyxx&gt; implements
78 75 hytjxx.setYdqp(wHyyqjlManager.count(new LambdaQueryWrapper<WHyyqjl>().eq(WHyyqjl::getFHyyhid, userid)));
79 76  
80 77 ArrayList<String> syzts = new ArrayList<>();
81   - syzts.add(QpztEnum.syz.getInfo());
82   - syzts.add(QpztEnum.tqz.getInfo());
  78 + syzts.add(QpztEnum.syz.getCode());
  79 + syzts.add(QpztEnum.tqz.getCode());
83 80  
84 81  
85 82 hytjxx.setZyqp(wHyyqjlManager.count(
... ... @@ -155,7 +152,7 @@ public class HyxxManagerImpl extends BaseManagerImpl&lt;HyxxDao, WHyxx&gt; implements
155 152 if (ObjectUtils.isEmpty(wHyxx_select)) {
156 153 throw new RuntimeException("会员信息不存在");
157 154 }
158   - if (RzztEnum.rzz.getInfo().equals(wHyxx_select.getFRzzt()) || RzztEnum.yrz.getInfo().equals(wHyxx_select.getFRzzt())) {
  155 + if (RzztEnum.rzz.getCode().equals(wHyxx_select.getFRzzt()) || RzztEnum.yrz.getCode().equals(wHyxx_select.getFRzzt())) {
159 156 throw new RuntimeException("认证中/已认证状态下不能再次认证");
160 157 }
161 158 WCzxx wCzxx = wCzxxDao.selectById(wHyxx.getFSsczID());
... ... @@ -180,7 +177,7 @@ public class HyxxManagerImpl extends BaseManagerImpl&lt;HyxxDao, WHyxx&gt; implements
180 177 wHyxx_select.setFFrsfzghy(wHyxx.getFFrsfzghy());
181 178 wHyxx_select.setFSymc(wHyxx.getFSymc());
182 179 wHyxx_select.setFShtysbm(wHyxx.getFShtysbm());
183   - wHyxx_select.setFRzzt(RzztEnum.rzz.getInfo());
  180 + wHyxx_select.setFRzzt(RzztEnum.rzz.getCode());
184 181 wHyxx_select.setFTjsmrzsj(LocalDateTime.now());
185 182 baseMapper.updateById(wHyxx_select);
186 183 }
... ... @@ -194,7 +191,7 @@ public class HyxxManagerImpl extends BaseManagerImpl&lt;HyxxDao, WHyxx&gt; implements
194 191 hyxx1.setFSjh(wHydzVo.getFLxrdh());
195 192 hyxx1.setFHync(wHydzVo.getFLxr());
196 193 hyxx1.setFXm(wHydzVo.getFLxr());
197   - hyxx1.setFSfzc(SfztEnum.n.getInfo());
  194 + hyxx1.setFSfzc(SfztEnum.n.getCode());
198 195  
199 196 hyxx1.setFHylx(wHydzVo.getFHylx());
200 197 hyxx1.setFSfzh(wHydzVo.getFSfzh());
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/HyyqjlManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -38,14 +38,14 @@ public class HyyqjlManagerImpl extends BaseManagerImpl&lt;HyyqjlDao, WHyyqjl&gt; imple
38 38  
39 39  
40 40 @Override
41   - public IPage<YhyqjlVo> pageList(Page page, HyyqjlDto hyyqjlDto) {
  41 + public IPage<WHyyqjl> pageList(Page page, HyyqjlDto hyyqjlDto) {
42 42 LambdaQueryWrapper<WHyyqjl> lambdaQuery = Wrappers.lambdaQuery(WHyyqjl.class);
43 43 lambdaQuery.eq(WHyyqjl::getFHyyhid, hyyqjlDto.getHyid());
44 44 if (StrUtil.isNotBlank(hyyqjlDto.getZt())) {
45 45 if (QpztEnum.syz.getInfo().equals(hyyqjlDto.getZt())) {
46 46 ArrayList<String> ztList = new ArrayList<>();
47   - ztList.add(QpztEnum.syz.getInfo());
48   - ztList.add(QpztEnum.tqz.getInfo());
  47 + ztList.add(QpztEnum.syz.getCode());
  48 + ztList.add(QpztEnum.tqz.getCode());
49 49 lambdaQuery.in(true, WHyyqjl::getFZt, ztList);
50 50 } else {
51 51 lambdaQuery.eq(StrUtil.isNotBlank(hyyqjlDto.getZt()), WHyyqjl::getFZt, hyyqjlDto.getZt());
... ... @@ -53,7 +53,10 @@ public class HyyqjlManagerImpl extends BaseManagerImpl&lt;HyyqjlDao, WHyyqjl&gt; imple
53 53 }
54 54 lambdaQuery.like(StrUtil.isNotBlank(hyyqjlDto.getQptm()), WHyyqjl::getFQptm, hyyqjlDto.getQptm());
55 55 lambdaQuery.orderByDesc(WHyyqjl::getFCjsj);
56   - IPage<YhyqjlVo> data = baseMapper.selectPage(page, lambdaQuery);
  56 + IPage<WHyyqjl> data = baseMapper.selectPage(page, lambdaQuery);
  57 + for (WHyyqjl record : data.getRecords()) {
  58 + record.setFZt(QpztEnum.valueOf(record.getFZt()).getInfo());
  59 + }
57 60 return data;
58 61 }
59 62  
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/TqglManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -90,9 +90,9 @@ public class TqglManagerImpl extends BaseManagerImpl&lt;TqglDao, WTqgl&gt; implements
90 90 wTqgl.setFWd(wdd.getFShdzwd());
91 91 }
92 92 wTqgl.setFDdid(wHyyqjl.getFDdid());
93   - wTqgl.setFZt(QpztEnum.dhs.getInfo());
  93 + wTqgl.setFZt(QpztEnum.dhs.getCode());
94 94 baseMapper.insert(wTqgl);
95   - wHyyqjl.setFZt(QpztEnum.tqz.getInfo());
  95 + wHyyqjl.setFZt(QpztEnum.tqz.getCode());
96 96 wHyyqjlManager.updateById(wHyyqjl);
97 97 }
98 98  
... ...
backend/lpg-user/src/main/resources/mapper/BxbMapper.xml
  Diff comments   View file @f3c368e
... ... @@ -92,7 +92,7 @@
92 92 </if>
93 93 <if test="query.fZt != null and query.fZt != ''">
94 94 and w_bxb.F_zt = #{query.fZt}
95   - <if test="query.fZt == '已处理'.toString() and query.fWxryhid != null and query.fWxryhid != ''">
  95 + <if test="query.fZt == 'ycl'.toString() and query.fWxryhid != null and query.fWxryhid != ''">
96 96 and w_bxb.F_wxryhID = #{query.fWxryhid}
97 97 </if>
98 98 </if>
... ...
backend/lpg-user/src/main/resources/mapper/CzxxMapper.xml
  Diff comments   View file @f3c368e
... ... @@ -128,7 +128,7 @@
128 128 6371 * ACOS( COS(RADIANS(#{wd})) * COS(RADIANS(F_wd)) * COS(
129 129 RADIANS(F_jd) - RADIANS(#{jd})) + SIN(RADIANS(#{wd})) * SIN( RADIANS(F_wd))) AS distance
130 130 FROM w_station_regional_division
131   - INNER JOIN w_czxx ON w_czxx.ID_ = w_station_regional_division.f_ssczId and w_station_regional_division.F_regional_type = '经营区域'
  131 + INNER JOIN w_czxx ON w_czxx.ID_ = w_station_regional_division.f_ssczId and w_station_regional_division.F_regional_type = '1'
132 132 WHERE
133 133 ST_Contains(w_station_regional_division.f_boundary, ST_GeomFromText(#{point}))
134 134 <![CDATA[ AND (6371 * ACOS( COS(RADIANS(#{wd})) * COS(RADIANS(w_czxx.F_wd)) * COS(
... ...
backend/lpg/src/main/java/com/hotent/lpg/controller/MobileController.java
  Diff comments   View file @f3c368e
... ... @@ -90,7 +90,7 @@ public class MobileController {
90 90 hyxx.setFXm(request.getPhone());
91 91 hyxx.setFHylx(HylxEnum.jm.getInfo());
92 92 hyxx.setFZt(UserStateEnum.zc.getInfo());
93   - hyxx.setFSfzc(SfztEnum.y.getInfo());
  93 + hyxx.setFSfzc(SfztEnum.y.getCode());
94 94 // hyxx.setFMm(uuid.substring(0, 8));
95 95 // hyxx.setFCjsj(LocalDateTime.now());
96 96 // wHyxxManager.save(hyxx);
... ...
backend/lpg/src/main/java/com/hotent/lpg/controller/WQplxController.java
  Diff comments   View file @f3c368e
... ... @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6 import com.hotent.base.controller.BaseController;
7 7 import com.hotent.base.model.CommonResult;
8 8 import com.hotent.base.util.StringUtil;
  9 +import com.hotent.lpg.common.enums.QplxztEnum;
9 10 import com.hotent.lpg.manager.WQplxManager;
10 11 import com.hotent.lpg.common.model.WQplx;
11 12 import io.swagger.annotations.ApiOperation;
... ... @@ -33,7 +34,7 @@ public class WQplxController extends BaseController&lt;WQplxManager, WQplx&gt; {
33 34 @ApiOperation(value = "通过门店（厂站）获取气瓶类型列表（商品）", httpMethod = "GET", notes = "通过门店（厂站）获取气瓶类型列表（商品）")
34 35 public CommonResult<IPage<WQplx>> list(Page page, @RequestParam(required = true) String czid) throws Exception {
35 36  
36   - IPage<WQplx> list = wQplxManager.list(page,czid,"已上架");
  37 + IPage<WQplx> list = wQplxManager.list(page,czid, QplxztEnum.ysj.getCode());
37 38 return CommonResult.<IPage<WQplx>>ok().value(list);
38 39 }
39 40  
... ...
backend/lpg/src/main/java/com/hotent/lpg/controller/yg/WStaffBxbController.java
  Diff comments   View file @f3c368e
... ... @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6 import com.hotent.base.controller.BaseController;
7 7 import com.hotent.base.model.CommonResult;
8 8 import com.hotent.base.util.StringUtil;
  9 +import com.hotent.lpg.common.enums.BxztEnum;
9 10 import com.hotent.lpg.manager.WBxbManager;
10 11 import com.hotent.lpg.manager.WCurrentInfoManager;
11 12 import com.hotent.lpg.common.model.WBxb;
... ... @@ -63,6 +64,7 @@ public class WStaffBxbController extends BaseController&lt;WBxbManager, WBxb&gt; {
63 64 @ApiOperation(value = "员工报修列表", httpMethod = "GET", notes = "员工报修列表")
64 65 public CommonResult bxbPage(Page page, WBxb wBxb) {
65 66 log.info("保修列表参数，page={},wBxb={}", page, wBxb);
  67 + wBxb.setFZt(BxztEnum.valueOf(wBxb.getFZt()).getCode());
66 68 String currentUserId = scriptImpl.getCurrentUserId();
67 69 WYgxx wYgxx = wCurrentInfoManager.getCurrentWygxxByUserId(currentUserId);
68 70 if (wYgxx == null) {
... ...
backend/lpg/src/main/java/com/hotent/lpg/controller/yg/WStaffQplxController.java
  Diff comments   View file @f3c368e
... ... @@ -46,7 +46,7 @@ public class WStaffQplxController {
46 46 throw new RuntimeException("员工信息不存在");
47 47 }
48 48 //分页查询
49   - wQplx.setfSfsj(QplxztEnum.ysj.getInfo());
  49 + wQplx.setfSfsj(QplxztEnum.ysj.getCode());
50 50 wQplx.setfSsczid(wYgxx.getFSsczid());
51 51 IPage<WQplx> resultPage = wQplxManager.staffQplxPage(page, wQplx);
52 52 YgqpResponse ygqpResponse = new YgqpResponse();
... ...
backend/lpg/src/main/java/com/hotent/lpg/manager/impl/MobileUserManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -140,9 +140,9 @@ public class MobileUserManagerImpl implements MobileUserManager {
140 140 if (ObjectUtils.isNotEmpty(jsCode)) {
141 141 saveOrUpdateUserParam(userid, jsCode, UserParamsEnums.dqjs.getCode());
142 142 } else {
143   - List<WYgxx> list = wYgxxDao.selectList(Wrappers.<WYgxx>lambdaQuery().eq(WYgxx::getFUserid, userid).eq(WYgxx::getFSsczid, orgId).eq(WYgxx::getFSslx, YglxEnum.czyg.getInfo()));
  143 + List<WYgxx> list = wYgxxDao.selectList(Wrappers.<WYgxx>lambdaQuery().eq(WYgxx::getFUserid, userid).eq(WYgxx::getFSsczid, orgId).eq(WYgxx::getFSslx, YglxEnum.czyg.getCode()));
144 144 if (ObjectUtils.isEmpty(list)) {
145   - list = wYgxxDao.selectList(Wrappers.<WYgxx>lambdaQuery().eq(WYgxx::getFUserid, userid).eq(WYgxx::getFSsqyid, orgId).eq(WYgxx::getFSslx, YglxEnum.qyyg.getInfo()));
  145 + list = wYgxxDao.selectList(Wrappers.<WYgxx>lambdaQuery().eq(WYgxx::getFUserid, userid).eq(WYgxx::getFSsqyid, orgId).eq(WYgxx::getFSslx, YglxEnum.qyyg.getCode()));
146 146 }
147 147 if (ObjectUtils.isNotEmpty(list)) {
148 148 saveOrUpdateUserParam(userid, list.get(0).getFJscode(), UserParamsEnums.dqjs.getCode());
... ...
backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WAfterScriptManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -276,9 +276,9 @@ public class WAfterScriptManagerImpl implements WAfterScriptManager {
276 276 //新增 判断此用户是否已经创建过了
277 277 List<WYgxx> wygxxList = new ArrayList<>();
278 278 if (YglxEnum.qyyg.getInfo().equals(sslx)) {
279   - wygxxList = wYgxxDao.selectList(Wrappers.<WYgxx>lambdaQuery().eq(WYgxx::getFSjh, sjh).eq(WYgxx::getFSsqyid, ssqyID).eq(WYgxx::getFSslx, sslx));
  279 + wygxxList = wYgxxDao.selectList(Wrappers.<WYgxx>lambdaQuery().eq(WYgxx::getFSjh, sjh).eq(WYgxx::getFSsqyid, ssqyID).eq(WYgxx::getFSslx, YglxEnum.qyyg.getCode()));
280 280 } else if (YglxEnum.czyg.getInfo().equals(sslx)) {
281   - wygxxList = wYgxxDao.selectList(Wrappers.<WYgxx>lambdaQuery().eq(WYgxx::getFSjh, sjh).eq(WYgxx::getFSsqyid, ssqyID).eq(WYgxx::getFSslx, sslx).eq(WYgxx::getFSsczid, ssczID));
  281 + wygxxList = wYgxxDao.selectList(Wrappers.<WYgxx>lambdaQuery().eq(WYgxx::getFSjh, sjh).eq(WYgxx::getFSsqyid, ssqyID).eq(WYgxx::getFSslx, YglxEnum.czyg.getCode()).eq(WYgxx::getFSsczid, ssczID));
282 282 }
283 283 if (ObjectUtil.isNotEmpty(wygxxList)) {
284 284 if (YglxEnum.qyyg.getInfo().equals(sslx)) {
... ... @@ -489,7 +489,7 @@ public class WAfterScriptManagerImpl implements WAfterScriptManager {
489 489 qpssxxDto.setFDqq(wCzxx.getFSsq());
490 490 qpssxxDto.setFDqjd(wCzxx.getFSsjd());
491 491 qpssxxDto.setFDqxxdz(wCzxx.getFXxdz());
492   - qpssxxDto.setFCtzt(QpztEnum.mp.getInfo());
  492 + qpssxxDto.setFCtzt(QpztEnum.mp.getCode());
493 493 qpssxxDto.setFQptm(qpxx.getFQptm());
494 494 wQpssxxManager.createOrUpdate(qpssxxDto);
495 495 }
... ...
backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WAjManagerImpl.java
  Diff comments   View file @f3c368e
1 1 package com.hotent.lpg.manager.impl;
2 2  
3 3 import cn.hutool.core.bean.BeanUtil;
  4 +import cn.hutool.core.util.ObjectUtil;
4 5 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
5 6 import com.baomidou.mybatisplus.core.metadata.IPage;
6 7 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
... ... @@ -80,18 +81,18 @@ public class WAjManagerImpl extends BaseManagerImpl&lt;WAjDao, WAj&gt; implements WAjM
80 81 @Override
81 82 public IPage<AjxxVo> pageList(Page page, AjDto ajDto,String filterFieldSql) {
82 83 ArrayList<String> ajzt = new ArrayList<>();
83   - if ("完成安检".equals(ajDto.getFAjjl())) {
84   - ajzt.add("已整改");
85   - ajzt.add("完成安检");
  84 + if (AjztEnum.wcaj.getInfo().equals(ajDto.getFAjjl())) {
  85 + ajzt.add(AjztEnum.yzg.getCode());
  86 + ajzt.add(AjztEnum.wcaj.getCode());
86 87 }
87   - if ("待整改".equals(ajDto.getFAjjl())) {
88   - ajzt.add("待整改");
  88 + if (AjztEnum.dzg.getInfo().equals(ajDto.getFAjjl())) {
  89 + ajzt.add(AjztEnum.dzg.getCode());
89 90 }
90 91 if ("随瓶".equals(ajDto.getFAjlx())) {
91   - ajDto.setFAjlx("随瓶安检");
  92 + ajDto.setFAjlx(AjlxEnum.spaj.getCode());
92 93 }
93 94 if ("定期".equals(ajDto.getFAjlx())) {
94   - ajDto.setFAjlx("定期安检");
  95 + ajDto.setFAjlx(AjlxEnum.dqaj.getCode());
95 96 }
96 97 if ("全部".equals(ajDto.getFAjjl())) {
97 98 ajDto.setFAjjl(null);
... ... @@ -126,7 +127,11 @@ public class WAjManagerImpl extends BaseManagerImpl&lt;WAjDao, WAj&gt; implements WAjM
126 127 // List<AjxxRequest> rqpxlbjzz = rhaj.getRqpxlbjzz();
127 128  
128 129 WAj wAj = new WAj();
129   - wAj.setFAjlx(AjlxEnum.dqaj.getInfo());
  130 + if (wDd == null) {
  131 + wAj.setFAjlx(AjlxEnum.dqaj.getCode());
  132 + } else {
  133 + wAj.setFAjlx(AjlxEnum.spaj.getCode());
  134 + }
130 135 wAj.setFHyyhid(khxx.getHyID());
131 136 wAj.setFXcpz(rhaj.getXcpz());
132 137 wAj.setFAjjl(rhaj.getAjjg());
... ... @@ -191,12 +196,12 @@ public class WAjManagerImpl extends BaseManagerImpl&lt;WAjDao, WAj&gt; implements WAjM
191 196  
192 197 String sfjsbcps = rhaj.getSfjsbcps();
193 198 if (SfztEnum.y.getInfo().equals(sfjsbcps)) {
194   - wAj.setFAjzt(AjztEnum.dzg.getInfo());
  199 + wAj.setFAjzt(AjztEnum.dzg.getCode());
195 200 } else {
196   - wAj.setFAjzt(AjztEnum.wcaj.getInfo());
  201 + wAj.setFAjzt(AjztEnum.wcaj.getCode());
197 202 }
198 203 if ("存在隐患".equals(rhaj.getAjjg())) {//加一层判断以这个为准
199   - wAj.setFAjzt(AjztEnum.dzg.getInfo());
  204 + wAj.setFAjzt(AjztEnum.dzg.getCode());
200 205 }
201 206 baseMapper.insert(wAj);
202 207 List<WAjxq> wAjxqList = new ArrayList<>();//安检详情集合
... ... @@ -228,7 +233,7 @@ public class WAjManagerImpl extends BaseManagerImpl&lt;WAjDao, WAj&gt; implements WAjM
228 233 if (wAj == null) {
229 234 throw new RuntimeException("安检工单不存在");
230 235 }
231   - if (AjztEnum.yzg.getInfo().equals(wAj.getFAjzt())) {
  236 + if (AjztEnum.yzg.getCode().equals(wAj.getFAjzt())) {
232 237 throw new RuntimeException("安检工单已整改");
233 238 }
234 239 wAj.setFWxsj(LocalDateTime.now());
... ... @@ -242,7 +247,7 @@ public class WAjManagerImpl extends BaseManagerImpl&lt;WAjDao, WAj&gt; implements WAjM
242 247 wAj.setFWxrczid(wYgxx.getFSsczid());
243 248 wAj.setFWxrqymc(wYgxx.getFSsqymc());
244 249 wAj.setFWxrczmc(wYgxx.getFSsczmc());
245   - wAj.setFAjzt(AjztEnum.yzg.getInfo());
  250 + wAj.setFAjzt(AjztEnum.yzg.getCode());
246 251 baseMapper.updateById(wAj);
247 252 }
248 253  
... ... @@ -253,6 +258,9 @@ public class WAjManagerImpl extends BaseManagerImpl&lt;WAjDao, WAj&gt; implements WAjM
253 258 if (wYgxx == null) {
254 259 throw new RuntimeException("员工信息不存在");
255 260 }
  261 + if (ObjectUtil.isNotEmpty(wAj.getFAjzt())) {
  262 + wAj.setFAjzt(AjztEnum.valueOf(wAj.getFAjzt()).getCode());
  263 + }
256 264 wAj.setFJcczid(wYgxx.getFSsczid());
257 265 ArrayList<String> orgList = scriptImpl.getDataPermission("loginUserSubCurOrgs");
258 266 Page<WAj> result = baseMapper.staffAjPage(page, wAj,orgList);
... ... @@ -261,6 +269,8 @@ public class WAjManagerImpl extends BaseManagerImpl&lt;WAjDao, WAj&gt; implements WAjM
261 269 List<WAjxq> ajxqList = wAjxqManager.list(Wrappers.<WAjxq>lambdaQuery().eq(WAjxq::getfAjid, record.getId()));
262 270 Map<String, List<WAjxq>> sslxMap = ajxqList.stream().collect(Collectors.groupingBy(WAjxq::getfSslx));
263 271 record.setSslxMap(sslxMap);
  272 + record.setFAjzt(AjztEnum.valueOf(record.getFAjzt()).getInfo());
  273 + record.setFAjlx(AjlxEnum.valueOf(record.getFAjlx()).getInfo());
264 274 }
265 275 return result;
266 276 }
... ... @@ -273,6 +283,8 @@ public class WAjManagerImpl extends BaseManagerImpl&lt;WAjDao, WAj&gt; implements WAjM
273 283 Map<String, List<WAjxq>> sslxMap = ajxqList.stream().collect(Collectors.groupingBy(WAjxq::getfSslx));
274 284 detail.setSslxMap(sslxMap);
275 285 }
  286 + detail.setFAjzt(AjztEnum.valueOf(detail.getFAjzt()).getInfo());
  287 + detail.setFAjlx(AjlxEnum.valueOf(detail.getFAjlx()).getInfo());
276 288 return detail;
277 289 }
278 290  
... ...
backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WBxbManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -132,6 +132,9 @@ public class WBxbManagerImpl extends BaseManagerImpl&lt;WBxbDao, WBxb&gt; implements W
132 132 @Override
133 133 public IPage<BxbResponse> bxbPage(Page page, WBxb wBxb) {
134 134 Page<BxbResponse> result = baseMapper.bxbPage(page, wBxb);
  135 + for (BxbResponse record : result.getRecords()) {
  136 + record.setFZt(BxztEnum.valueOf(record.getFZt()).getInfo());
  137 + }
135 138 return result;
136 139 }
137 140  
... ...
backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WClxxManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -68,7 +68,7 @@ public class WClxxManagerImpl extends BaseManagerImpl&lt;WClxxDao, WClxx&gt; implement
68 68 if (wYgxx == null) {
69 69 throw new RuntimeException("员工信息不存在");
70 70 }
71   - if (YglxEnum.czyg.getInfo().equals(wYgxx.getFSslx())) {
  71 + if (YglxEnum.czyg.getCode().equals(wYgxx.getFSslx())) {
72 72 WCzxx wCzxx = wCzxxDao.selectById(wYgxx.getFSsczid());
73 73 if (wCzxx == null) {
74 74 throw new RuntimeException("员工所属厂站信息不存在");
... ... @@ -76,7 +76,7 @@ public class WClxxManagerImpl extends BaseManagerImpl&lt;WClxxDao, WClxx&gt; implement
76 76 wClxx.setFSsczID(wYgxx.getFSsczid());
77 77 result = baseMapper.clxxPage(page, wClxx);
78 78 }
79   - if (YglxEnum.qyyg.getInfo().equals(wYgxx.getFSslx())) {
  79 + if (YglxEnum.qyyg.getCode().equals(wYgxx.getFSslx())) {
80 80 WQyxx wQyxx = wQyxxDao.selectById(wYgxx.getFSsqyid());
81 81 if (wQyxx == null) {
82 82 throw new RuntimeException("员工所属企业信息不存在");
... ...
backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WDdManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -266,7 +266,7 @@ public class WDdManagerImpl extends BaseManagerImpl&lt;WDdDao, WDd&gt; implements WDdM
266 266  
267 267 //订单数据
268 268 wDd.setFPsrid(wYgxx.getId());//配送人id
269   - wDd.setFPsfs(DdpsfsEnum.ps.getInfo());//配送方式
  269 + wDd.setFPsfs(DdpsfsEnum.ps.getCode());//配送方式
270 270 wDd.setFDdzt(DdztEnum.COMPLETED.getCode());//订单状态
271 271 wDd.setFBz(khxx.getBz());//备注
272 272 wDd.setFSjwcsj(now_string);//实际完成时间
... ... @@ -303,7 +303,7 @@ public class WDdManagerImpl extends BaseManagerImpl&lt;WDdDao, WDd&gt; implements WDdM
303 303 if (SfztEnum.y.getInfo().equals(sfjsbcps)) {
304 304 //停止配送，结束订单
305 305 log.info("安检信息不通过，停止配送，订单id={}，订单编号={}", wDd.getId(), wDd.getFDddh());
306   - if (DdlyEnum.wdps.getInfo().equals(wDd.getFDdly())) {
  306 + if (DdlyEnum.wdps.getCode().equals(wDd.getFDdly())) {
307 307 log.info("无单配送结束配送，删除订单信息");
308 308 baseMapper.deleteById(wDd.getId());
309 309 wDdxqManager.remove(Wrappers.<WDdxq>lambdaQuery().eq(WDdxq::getfDdid,wDd.getId()));
... ... @@ -320,11 +320,12 @@ public class WDdManagerImpl extends BaseManagerImpl&lt;WDdDao, WDd&gt; implements WDdM
320 320  
321 321  
322 322 //满瓶发出
323   - String fMpfcqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, khxx, now, mpfc, QpcyzlxEnum.hy.getInfo(), QpztEnum.mp.getInfo(), QplzjdmcEnum.smps.getInfo(), wDd.getFHyyhid(), wQpssxxList_mpfc, wDd);
  323 + String fMpfcqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, khxx, now, mpfc, QpcyzlxEnum.hy.getCode(), QpztEnum.mp.getCode(), QplzjdmcEnum.smps.getInfo(), wDd.getFHyyhid(), wQpssxxList_mpfc, wDd);
  324 + qplz_qpssxx_Handler(wCzxx, wYgxx, khxx, now, mpfc, QpcyzlxEnum.hy.getCode(), QpztEnum.mp.getCode(), QplzjdmcEnum.rhaj.getInfo(), wDd.getFHyyhid(), wQpssxxList_mpfc, wDd);
324 325 //空瓶回收
325   - String fKphsqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, khxx, now, kphs, QpcyzlxEnum.yg.getInfo(), QpztEnum.kp.getInfo(), QplzjdmcEnum.kphssqg.getInfo(), wYgxx.getFUserid(), wQpssxxList_kphs, wDd);
  326 + String fKphsqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, khxx, now, kphs, QpcyzlxEnum.yg.getCode(), QpztEnum.kp.getCode(), QplzjdmcEnum.kphssqg.getInfo(), wYgxx.getFUserid(), wQpssxxList_kphs, wDd);
326 327 //满瓶回收
327   - String fMphsqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, khxx, now, mphs, QpcyzlxEnum.yg.getInfo(), QpztEnum.mp.getInfo(), QplzjdmcEnum.mphssqg.getInfo(), wYgxx.getFUserid(), wQpssxxList_mphs, wDd);
  328 + String fMphsqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, khxx, now, mphs, QpcyzlxEnum.yg.getCode(), QpztEnum.mp.getCode(), QplzjdmcEnum.mphssqg.getInfo(), wYgxx.getFUserid(), wQpssxxList_mphs, wDd);
328 329  
329 330  
330 331 //会员用气记录
... ... @@ -404,14 +405,14 @@ public class WDdManagerImpl extends BaseManagerImpl&lt;WDdDao, WDd&gt; implements WDdM
404 405 throw new RuntimeException("请添加无单配送气瓶类型");
405 406 }
406 407 StaffOrderRequest.Spxx spxx = new StaffOrderRequest.Spxx();
407   - spxx.setDdbz(DdlyEnum.wdps.getInfo());
  408 + spxx.setDdbz(DdlyEnum.wdps.getCode());
408 409 if (CollectionUtils.isNotEmpty(mpfc)) {
409 410 spxx.setNum(mpfc.size());
410 411 } else {
411 412 spxx.setNum(0);
412 413 }
413 414 spxx.setQplxID(wqplx.getId());
414   - CreateOrderRequest request = getCreateOrderRequest(khxx, spxx, DdlyEnum.wdps.getInfo());
  415 + CreateOrderRequest request = getCreateOrderRequest(khxx, spxx, DdlyEnum.wdps.getCode());
415 416 ArrayList<CreateOrderRequest.XqVO> xqVOS = new ArrayList<>();
416 417 CreateOrderRequest.XqVO xqVO = new CreateOrderRequest.XqVO();
417 418 xqVO.setQplxId(spxx.getQplxID());
... ... @@ -435,7 +436,7 @@ public class WDdManagerImpl extends BaseManagerImpl&lt;WDdDao, WDd&gt; implements WDdM
435 436 log.info("气瓶类型信息不存在，气瓶类型id={}", spxx.getQplxID());
436 437 throw new RuntimeException("气瓶信息不存在");
437 438 }
438   - CreateOrderRequest request = getCreateOrderRequest(khxx, spxx, DdlyEnum.bzxd.getInfo());
  439 + CreateOrderRequest request = getCreateOrderRequest(khxx, spxx, DdlyEnum.bzxd.getCode());
439 440 ArrayList<CreateOrderRequest.XqVO> xqVOS = new ArrayList<>();
440 441 CreateOrderRequest.XqVO xqVO = new CreateOrderRequest.XqVO();
441 442 xqVO.setQplxId(spxx.getQplxID());
... ... @@ -570,18 +571,18 @@ public class WDdManagerImpl extends BaseManagerImpl&lt;WDdDao, WDd&gt; implements WDdM
570 571 }
571 572 //校验满瓶发出气瓶信息
572 573 for (WQpssxx wQpssxx : mpfcQpssxxList) {
573   - if (!QpcyzlxEnum.cz.getInfo().equals(wQpssxx.getFCyzlx())) {
  574 + if (!QpcyzlxEnum.cz.getCode().equals(wQpssxx.getFCyzlx())) {
574 575 throw new RuntimeException(wQpssxx.getFQptm() + "当前不在厂站，无法发出");
575 576 }
576   - if (QpcyzlxEnum.cz.getInfo().equals(wQpssxx.getFCyzlx()) && !wQpssxx.getFCyczid().equals(wdd.getFCzid())) {
  577 + if (QpcyzlxEnum.cz.getCode().equals(wQpssxx.getFCyzlx()) && !wQpssxx.getFCyczid().equals(wdd.getFCzid())) {
577 578 throw new RuntimeException(wQpssxx.getFQptm() + "实时厂站信息与订单厂站信息不符，无法发出");
578 579 }
579 580 }
580 581  
581   - fMpfcqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, null, now, mpfc, QpcyzlxEnum.hy.getInfo(), QpztEnum.mp.getInfo(), QplzjdmcEnum.smzt.getInfo(), wdd.getFHyyhid(), wQpssxxList_mpfc, wdd);
  582 + fMpfcqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, null, now, mpfc, QpcyzlxEnum.hy.getCode(), QpztEnum.mp.getCode(), QplzjdmcEnum.smzt.getInfo(), wdd.getFHyyhid(), wQpssxxList_mpfc, wdd);
582 583 }
583   - String fKphsqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, null, now, kphs, QpcyzlxEnum.cz.getInfo(), QpztEnum.kp.getInfo(), QplzjdmcEnum.czzkphs.getInfo(), null, wQpssxxList_kphs, wdd);
584   - String fMphsqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, null, now, mphs, QpcyzlxEnum.cz.getInfo(), QpztEnum.mp.getInfo(), QplzjdmcEnum.czzmphs.getInfo(), null, wQpssxxList_mphs, wdd);
  584 + String fKphsqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, null, now, kphs, QpcyzlxEnum.cz.getCode(), QpztEnum.kp.getCode(), QplzjdmcEnum.czzkphs.getInfo(), null, wQpssxxList_kphs, wdd);
  585 + String fMphsqpgg = qplz_qpssxx_Handler(wCzxx, wYgxx, null, now, mphs, QpcyzlxEnum.cz.getCode(), QpztEnum.mp.getCode(), QplzjdmcEnum.czzmphs.getInfo(), null, wQpssxxList_mphs, wdd);
585 586  
586 587 //会员用气记录
587 588 wHyyqjlManager.createWHyyqjlList(wQpssxxList_mpfc, wdd, now_string, now, null, wYgxx);
... ... @@ -668,7 +669,7 @@ public class WDdManagerImpl extends BaseManagerImpl&lt;WDdDao, WDd&gt; implements WDdM
668 669 request.setXdrid(ContextUtil.getCurrentUserId());
669 670 request.setXdrmc(ContextUtil.getCurrentUser().getFullname());
670 671 request.setDdly(ddly);
671   - request.setPsfs(DdpsfsEnum.ps.getInfo());
  672 + request.setPsfs(DdpsfsEnum.ps.getCode());
672 673 request.setJd(khxx.getJd());
673 674 request.setWd(khxx.getWd());
674 675 if (spxx != null) {
... ... @@ -773,7 +774,7 @@ public class WDdManagerImpl extends BaseManagerImpl&lt;WDdDao, WDd&gt; implements WDdM
773 774 wQpssxx.setFCyzlx(cyzlx);
774 775 wQpssxx.setFCyczid(wYgxx.getFSsczid());
775 776 wQpssxx.setFCtzt(ctzt);
776   - if (QplzjdmcEnum.smps.getInfo().equals(lzmc)) {
  777 + if (QplzjdmcEnum.smps.getInfo().equals(lzmc) || QplzjdmcEnum.rhaj.getInfo().equals(lzmc)) {
777 778 wQpssxx.setFJd(StringUtil.isEmpty(wDd.getFShdzjd()) ? khxx.getJd() : wDd.getFShdzjd());
778 779 wQpssxx.setFWd(StringUtil.isEmpty(wDd.getFShdzwd()) ? khxx.getWd() : wDd.getFShdzwd());
779 780 wQpssxx.setFCyyhid(cyyhid);
... ... @@ -801,7 +802,9 @@ public class WDdManagerImpl extends BaseManagerImpl&lt;WDdDao, WDd&gt; implements WDdM
801 802 BeanUtil.copyProperties(wQpssxx, qpssxxDto);
802 803 qpssxxDto.setFLzmc(lzmc);
803 804 WQpssxx orUpdate = wQpssxxManager.createOrUpdate(qpssxxDto);
804   - wQpssxxList.add(orUpdate);
  805 + if (wQpssxxList != null) {
  806 + wQpssxxList.add(orUpdate);
  807 + }
805 808 }
806 809 }
807 810  
... ...
backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WHyxxManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -99,8 +99,8 @@ public class WHyxxManagerImpl extends BaseManagerImpl&lt;WHyxxDao, WHyxx&gt; implement
99 99 hytjxx.setYdqp(wHyyqjlManager.count(new LambdaQueryWrapper<WHyyqjl>().eq(WHyyqjl::getFHyyhid, userid)));
100 100  
101 101 ArrayList<String> syzts = new ArrayList<>();
102   - syzts.add(QpztEnum.syz.getInfo());
103   - syzts.add(QpztEnum.tqz.getInfo());
  102 + syzts.add(QpztEnum.syz.getCode());
  103 + syzts.add(QpztEnum.tqz.getCode());
104 104  
105 105  
106 106 hytjxx.setZyqp(wHyyqjlManager.count(
... ... @@ -225,7 +225,7 @@ public class WHyxxManagerImpl extends BaseManagerImpl&lt;WHyxxDao, WHyxx&gt; implement
225 225 hyxx1.setFSjh(wHydzVo.getFLxrdh());
226 226 hyxx1.setFHync(wHydzVo.getFLxr());
227 227 hyxx1.setFXm(wHydzVo.getFLxr());
228   - hyxx1.setFSfzc(SfztEnum.n.getInfo());
  228 + hyxx1.setFSfzc(SfztEnum.n.getCode());
229 229  
230 230 hyxx1.setFHylx(wHydzVo.getFHylx());
231 231 hyxx1.setFSfzh(wHydzVo.getFSfzh());
... ... @@ -298,7 +298,7 @@ public class WHyxxManagerImpl extends BaseManagerImpl&lt;WHyxxDao, WHyxx&gt; implement
298 298 if (ObjectUtils.isEmpty(wHyxx_select)) {
299 299 throw new RuntimeException("会员信息不存在");
300 300 }
301   - if (RzztEnum.rzz.getInfo().equals(wHyxx_select.getFRzzt()) || RzztEnum.yrz.getInfo().equals(wHyxx_select.getFRzzt())) {
  301 + if (RzztEnum.rzz.getCode().equals(wHyxx_select.getFRzzt()) || RzztEnum.yrz.getCode().equals(wHyxx_select.getFRzzt())) {
302 302 throw new RuntimeException("认证中/已认证状态下不能再次认证");
303 303 }
304 304 WCzxx wCzxx = wCzxxDao.selectById(wHyxx.getFSsczID());
... ... @@ -323,7 +323,7 @@ public class WHyxxManagerImpl extends BaseManagerImpl&lt;WHyxxDao, WHyxx&gt; implement
323 323 wHyxx_select.setFFrsfzghy(wHyxx.getFFrsfzghy());
324 324 wHyxx_select.setFSymc(wHyxx.getFSymc());
325 325 wHyxx_select.setFShtysbm(wHyxx.getFShtysbm());
326   - wHyxx_select.setFRzzt(RzztEnum.rzz.getInfo());
  326 + wHyxx_select.setFRzzt(RzztEnum.rzz.getCode());
327 327 wHyxx_select.setFTjsmrzsj(LocalDateTime.now());
328 328 baseMapper.updateById(wHyxx_select);
329 329 }
... ... @@ -331,10 +331,10 @@ public class WHyxxManagerImpl extends BaseManagerImpl&lt;WHyxxDao, WHyxx&gt; implement
331 331 @Override
332 332 public void automaticAuthentication(WHyxx wHyxx) {
333 333 if (wHyxx != null ) {
334   - if (SfztEnum.y.getInfo().equals(wHyxx.getFSfsmrz())) {
335   - wHyxx.setFRzzt(RzztEnum.yrz.getInfo());
  334 + if (SfztEnum.y.getCode().equals(wHyxx.getFSfsmrz())) {
  335 + wHyxx.setFRzzt(RzztEnum.yrz.getCode());
336 336 } else {
337   - wHyxx.setFRzzt(RzztEnum.rzwtg.getInfo());
  337 + wHyxx.setFRzzt(RzztEnum.rzwtg.getCode());
338 338 }
339 339 baseMapper.updateById(wHyxx);
340 340 } else {
... ...
backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WHyyqjlManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -79,10 +79,10 @@ public class WHyyqjlManagerImpl extends BaseManagerImpl&lt;WHyyqjlDao, WHyyqjl&gt; imp
79 79 LambdaQueryWrapper<WHyyqjl> lambdaQuery = Wrappers.lambdaQuery(WHyyqjl.class);
80 80 lambdaQuery.eq(WHyyqjl::getFHyyhid, hyyqjlDto.getHyid());
81 81 if (StrUtil.isNotBlank(hyyqjlDto.getZt())) {
82   - if (QpztEnum.syz.getInfo().equals(hyyqjlDto.getZt())) {
  82 + if (QpztEnum.syz.getCode().equals(hyyqjlDto.getZt())) {
83 83 ArrayList<String> ztList = new ArrayList<>();
84   - ztList.add(QpztEnum.syz.getInfo());
85   - ztList.add(QpztEnum.tqz.getInfo());
  84 + ztList.add(QpztEnum.syz.getCode());
  85 + ztList.add(QpztEnum.tqz.getCode());
86 86 lambdaQuery.in(true, WHyyqjl::getFZt,ztList);
87 87 } else {
88 88 lambdaQuery.eq(StrUtil.isNotBlank(hyyqjlDto.getZt()), WHyyqjl::getFZt, hyyqjlDto.getZt());
... ... @@ -131,7 +131,7 @@ public class WHyyqjlManagerImpl extends BaseManagerImpl&lt;WHyyqjlDao, WHyyqjl&gt; imp
131 131 wHyyqjl.setFXgsj(now);
132 132 wHyyqjl.setFQplzid(wQpssxx.getFQplzid());
133 133 wHyyqjl.setFDdid(wDd.getId());
134   - wHyyqjl.setFZt(QpztEnum.syz.getInfo());
  134 + wHyyqjl.setFZt(QpztEnum.syz.getCode());
135 135 wHyyqjl.setFAjid(ajId);
136 136 wHyyqjl.setFAzczid(wYgxx.getFSsczid());
137 137 wHyyqjl.setFAzczmc(wYgxx.getFSsczmc());
... ... @@ -161,12 +161,12 @@ public class WHyyqjlManagerImpl extends BaseManagerImpl&lt;WHyyqjlDao, WHyyqjl&gt; imp
161 161 */
162 162 private List<WHyyqjl> handlerOldhyyqjl(WQpssxx wQpssxx,WYgxx wYgxx,String now_string,LocalDateTime now){
163 163 ArrayList<String> ztList = new ArrayList<>();
164   - ztList.add(QpztEnum.syz.getInfo());
165   - ztList.add(QpztEnum.tqz.getInfo());
  164 + ztList.add(QpztEnum.syz.getCode());
  165 + ztList.add(QpztEnum.tqz.getCode());
166 166 List<WHyyqjl> list = this.list(Wrappers.<WHyyqjl>lambdaQuery().eq(WHyyqjl::getFQpid, wQpssxx.getFQpid()).in(WHyyqjl::getFZt, ztList).orderByDesc(WHyyqjl::getFCjsj));
167 167 if (CollectionUtils.isNotEmpty(list)) {
168 168 for (WHyyqjl wHyyqjl : list) {
169   - wHyyqjl.setFZt(QpztEnum.ygh.getInfo());
  169 + wHyyqjl.setFZt(QpztEnum.ygh.getCode());
170 170 wHyyqjl.setFJssysj(now_string);
171 171 wHyyqjl.setFXgsj(now);
172 172 wHyyqjl.setFXgr(wYgxx.getFXm());
... ... @@ -175,7 +175,7 @@ public class WHyyqjlManagerImpl extends BaseManagerImpl&lt;WHyyqjlDao, WHyyqjl&gt; imp
175 175 List<WTqgl> wTqgls = wTqglManager.list(Wrappers.<WTqgl>lambdaQuery().in(WTqgl::getFHyyqjlid, list.stream().map(a -> a.getId()).collect(Collectors.toList())));
176 176 if (CollectionUtils.isNotEmpty(wTqgls)) {
177 177 for (WTqgl wTqgl : wTqgls) {
178   - wTqgl.setFZt(QpztEnum.yhs.getInfo());
  178 + wTqgl.setFZt(QpztEnum.yhs.getCode());
179 179 wTqgl.setFQplzid(wQpssxx.getFQplzid());
180 180 wTqgl.setFSjhsczid(wYgxx.getFSsczid());
181 181 wTqgl.setFSjhsczmc(wYgxx.getFSsczmc());
... ...
backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpssxxManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -136,7 +136,7 @@ public class WQpssxxManagerImpl extends BaseManagerImpl&lt;WQpssxxDao, WQpssxx&gt; imp
136 136  
137 137 @Override
138 138 public void getCzxx() {
139   - List<WQpssxx> wQpssxxes = baseMapper.selectList(Wrappers.<WQpssxx>lambdaQuery().eq(WQpssxx::getFCtzt, QpztEnum.kp.getInfo()).eq(WQpssxx::getFCyzlx, QpcyzlxEnum.cz.getInfo()));
  139 + List<WQpssxx> wQpssxxes = baseMapper.selectList(Wrappers.<WQpssxx>lambdaQuery().eq(WQpssxx::getFCtzt, QpztEnum.kp.getCode()).eq(WQpssxx::getFCyzlx, QpcyzlxEnum.cz.getInfo()));
140 140 if (ObjectUtil.isNotEmpty(wQpssxxes)) {
141 141 List<String> qpIdList = wQpssxxes.stream().map(a -> a.getFQpid()).collect(Collectors.toList());
142 142 log.info("qpIdList={}", qpIdList);
... ... @@ -240,7 +240,7 @@ public class WQpssxxManagerImpl extends BaseManagerImpl&lt;WQpssxxDao, WQpssxx&gt; imp
240 240 if (wQpssxx != null) {
241 241 QpssxxDto qpssxxDto = new QpssxxDto();
242 242 wQpssxx.setFZqbh(UniqueIdUtil.getSuid());
243   - wQpssxx.setFCtzt(QpztEnum.mp.getInfo());
  243 + wQpssxx.setFCtzt(QpztEnum.mp.getCode());
244 244 wQpssxx.setFGxsj(LocalDateTime.now());
245 245 BeanUtil.copyProperties(wQpssxx, qpssxxDto);
246 246 qpssxxDto.setFLzmc(QplzjdmcEnum.qpcz.getInfo());
... ... @@ -256,11 +256,11 @@ public class WQpssxxManagerImpl extends BaseManagerImpl&lt;WQpssxxDao, WQpssxx&gt; imp
256 256 */
257 257 private void tqglHandler(WQpssxx wQpssxx, WQplz wQplz) {
258 258 log.info("退气处理：wQpssxx={},wQplz={}", wQpssxx, wQplz);
259   - if (!QpcyzlxEnum.hy.getInfo().equals(wQpssxx.getFCyzlx())) {
260   - List<WTqgl> list = wTqglManager.list(Wrappers.<WTqgl>lambdaQuery().eq(WTqgl::getFQptm, wQpssxx.getFQptm()).eq(WTqgl::getFZt, QpztEnum.dhs.getInfo()));
  259 + if (!QpcyzlxEnum.hy.getCode().equals(wQpssxx.getFCyzlx())) {
  260 + List<WTqgl> list = wTqglManager.list(Wrappers.<WTqgl>lambdaQuery().eq(WTqgl::getFQptm, wQpssxx.getFQptm()).eq(WTqgl::getFZt, QpztEnum.dhs.getCode()));
261 261 if (CollectionUtils.isNotEmpty(list)) {
262 262 WTqgl wTqgl = list.get(0);
263   - wTqgl.setFZt(QpztEnum.yhs.getInfo());
  263 + wTqgl.setFZt(QpztEnum.yhs.getCode());
264 264 wTqgl.setFQplzid(wQplz.getId());
265 265 WCzxx wczxx = wCzxxManager.getById(wQplz.getFCyczid());
266 266 if (wczxx != null) {
... ... @@ -276,15 +276,15 @@ public class WQpssxxManagerImpl extends BaseManagerImpl&lt;WQpssxxDao, WQpssxx&gt; imp
276 276 wTqglManager.updateById(wTqgl);
277 277 WHyyqjl wHyyqjl = wHyyqjlManager.getById(wTqgl.getFHyyqjlid());
278 278 if (wHyyqjl != null) {
279   - wHyyqjl.setFZt(QpztEnum.ygh.getInfo());
  279 + wHyyqjl.setFZt(QpztEnum.ygh.getCode());
280 280 wHyyqjl.setFJssysj(wQplz.getFCzsj());
281 281 wHyyqjlManager.updateById(wHyyqjl);
282 282 }
283 283 }
284   - List<WHyyqjl> otherData = wHyyqjlManager.list(Wrappers.<WHyyqjl>lambdaQuery().eq(WHyyqjl::getFQptm, wQpssxx.getFQptm()).eq(WHyyqjl::getFZt, QpztEnum.syz.getInfo()));
  284 + List<WHyyqjl> otherData = wHyyqjlManager.list(Wrappers.<WHyyqjl>lambdaQuery().eq(WHyyqjl::getFQptm, wQpssxx.getFQptm()).eq(WHyyqjl::getFZt, QpztEnum.syz.getCode()));
285 285 if (CollectionUtils.isNotEmpty(otherData)) {
286 286 for (WHyyqjl otherDatum : otherData) {
287   - otherDatum.setFZt(QpztEnum.ygh.getInfo());
  287 + otherDatum.setFZt(QpztEnum.ygh.getCode());
288 288 otherDatum.setFJssysj(wQplz.getFCzsj());
289 289 }
290 290 wHyyqjlManager.saveOrUpdateBatch(otherData);
... ...
backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpxxManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -17,6 +17,10 @@ import com.hotent.base.util.BeanUtils;
17 17 import com.hotent.base.util.StringUtil;
18 18 import com.hotent.base.util.UniqueIdUtil;
19 19 import com.hotent.base.util.time.DateFormatUtil;
  20 +import com.hotent.lpg.common.enums.statemachine.QpEventEnum;
  21 +import com.hotent.lpg.common.enums.statemachine.QpHolderEnum;
  22 +import com.hotent.lpg.common.enums.statemachine.QpStateEnum;
  23 +import com.hotent.lpg.common.enums.statemachine.QpStateMachineNext;
20 24 import com.hotent.lpg.dao.WClxxDao;
21 25 import com.hotent.lpg.dao.WQpxxDao;
22 26 import com.hotent.lpg.manager.*;
... ... @@ -91,6 +95,8 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
91 95 private WCurrentInfoManager wCurrentInfoManager;
92 96 @Value("${qprk.dsfurl-enable}")
93 97 private boolean enable;
  98 + @Value("${qpcz.enable}")
  99 + private boolean qpczEnable;
94 100  
95 101 @Override
96 102 public QpxxDetailResponse getDetail(String id, String qpbh) {
... ... @@ -263,13 +269,11 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
263 269 if (CollectionUtils.isEmpty(orgIdList)) {
264 270 orgIdList.add(wYgxx.getFSsczid());
265 271 }
266   - boolean rk_check = true;
267 272 WQpxx wQpxx = baseMapper.selectOne(Wrappers.<WQpxx>lambdaQuery().eq(WQpxx::getFDsfurl, qptm));
268 273 if (ObjectUtil.isEmpty(wQpxx)) {
269 274 wQpxx = baseMapper.selectOne(Wrappers.<WQpxx>lambdaQuery().eq(WQpxx::getFQptm, qptm));
270 275 }
271 276 if (wQpxx == null && (QpczlxEnum.mprk.getCode().equals(czlx) || QpczlxEnum.kprk.getCode().equals(czlx) || QpczlxEnum.mplq.getCode().equals(czlx)) && enable) {
272   - rk_check = false;
273 277 //从第三方获取气瓶信息看是否存在，存在就同步到当前组织下，不存在就返回错误信息
274 278 List<WQpBaseInfo> qpBaseInfo = qpxxSyncService.getQpBaseInfo(qptm);
275 279 if (ObjectUtil.isEmpty(qpBaseInfo)) {
... ... @@ -306,11 +310,11 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
306 310 kphs_mphs_check(wQpssxx, wDd);
307 311 }
308 312 //满瓶领取、空瓶领取
309   - if (rk_check && (QpczlxEnum.mplq.getCode().equals(czlx) || QpczlxEnum.kplq.getCode().equals(czlx))) {
  313 + if ((QpczlxEnum.mplq.getCode().equals(czlx) || QpczlxEnum.kplq.getCode().equals(czlx))) {
310 314 kplq_mplq_check(orgIdList, wQpssxx, czlx, wQpxx);
311 315 }
312 316 // 满瓶入库、空瓶入库
313   - if (rk_check && (QpczlxEnum.mprk.getCode().equals(czlx) || QpczlxEnum.kprk.getCode().equals(czlx))) {
  317 + if ((QpczlxEnum.mprk.getCode().equals(czlx) || QpczlxEnum.kprk.getCode().equals(czlx))) {
314 318 kprk_mprk_check(orgIdList, wQpssxx);
315 319 }
316 320 // 满瓶出库 、 空瓶出库
... ... @@ -358,7 +362,7 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
358 362 wQpxx1.setFSsczmc(wYgxx.getFSsczmc());
359 363 wQpxx1.setFHyyhid(null);
360 364 wQpxx1.setFHyxm(null);
361   - wQpxx1.setFQpgslx(QpcyzlxEnum.cz.getInfo());
  365 + wQpxx1.setFQpgslx(QpcyzlxEnum.cz.getCode());
362 366 wQpxx1.setFQptm(qptm);
363 367 wQpxx1.setFZzrq(qpBaseInfo1.getFMakeDate());
364 368 wQpxx1.setFQpzl(qpBaseInfo1.getFZlMc());
... ... @@ -388,7 +392,7 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
388 392 qpssxxDto.setFCzr(ContextUtil.getCurrentUser().getFullname());
389 393 qpssxxDto.setFJd(wczxx != null ? wczxx.getFJd() : null);
390 394 qpssxxDto.setFWd(wczxx != null ? wczxx.getFWd() : null);
391   - qpssxxDto.setFCyzlx(QpcyzlxEnum.cz.getInfo());
  395 + qpssxxDto.setFCyzlx(QpcyzlxEnum.cz.getCode());
392 396 qpssxxDto.setFCyczid(wQpxx1.getFSsczid());
393 397 qpssxxDto.setFCyyhid(null);
394 398 qpssxxDto.setFDqsf(wczxx != null ? wczxx.getFSssf() : null);
... ... @@ -403,7 +407,7 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
403 407 }
404 408  
405 409 private void kpck_mpck_check(ArrayList<String> orgIdList, WQpssxx wQpssxx) {
406   - if (!QpcyzlxEnum.cz.getInfo().equals(wQpssxx.getFCyzlx())) {
  410 + if (!QpcyzlxEnum.cz.getCode().equals(wQpssxx.getFCyzlx())) {
407 411 throw new RuntimeException("气瓶不在厂站，无法出库");
408 412 }
409 413 if (!orgIdList.contains(wQpssxx.getFCyczid())) {
... ... @@ -412,10 +416,10 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
412 416 }
413 417  
414 418 private void kprk_mprk_check(ArrayList<String> orgIdList, WQpssxx wQpssxx) {
415   - if (!QpcyzlxEnum.cl.getInfo().equals(wQpssxx.getFCyzlx()) && !QpcyzlxEnum.yg.getInfo().equals(wQpssxx.getFCyzlx())) {
  419 + if (!QpcyzlxEnum.cl.getCode().equals(wQpssxx.getFCyzlx()) && !QpcyzlxEnum.yg.getCode().equals(wQpssxx.getFCyzlx())) {
416 420 throw new RuntimeException("气瓶不在车辆或员工手中，无法入库");
417 421 }
418   - if (QpcyzlxEnum.cl.getInfo().equals(wQpssxx.getFCyzlx())) {
  422 + if (QpcyzlxEnum.cl.getCode().equals(wQpssxx.getFCyzlx())) {
419 423 WClxx wClxx = wClxxDao.selectById(wQpssxx.getFCyclID());
420 424 if (wClxx == null) {
421 425 throw new RuntimeException("气瓶持有者车辆信息不存在");
... ... @@ -424,7 +428,7 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
424 428 throw new RuntimeException("气瓶持有者车辆信息不属于用户当前组织");
425 429 }
426 430 }
427   - if (QpcyzlxEnum.yg.getInfo().equals(wQpssxx.getFCyzlx())) {
  431 + if (QpcyzlxEnum.yg.getCode().equals(wQpssxx.getFCyzlx())) {
428 432 WYgxx one = wCurrentInfoManager.getCurrentWygxxByUserId(wQpssxx.getFCyyhid());
429 433 if (one == null) {
430 434 throw new RuntimeException("气瓶持有者员工信息不存在");
... ... @@ -449,24 +453,24 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
449 453 }
450 454  
451 455 private void kplq_mplq_check(ArrayList<String> orgIdList, WQpssxx wQpssxx, String lx, WQpxx wQpxx) {
452   - if (!QpcyzlxEnum.cz.getInfo().equals(wQpssxx.getFCyzlx())) {
  456 + if (!QpcyzlxEnum.cz.getCode().equals(wQpssxx.getFCyzlx())) {
453 457 throw new RuntimeException("气瓶不在厂站，无法领取");
454 458 }
455 459 if (!orgIdList.contains(wQpssxx.getFCyczid())) {
456 460 throw new RuntimeException("气瓶不在厂站，无法领取");
457 461 }
458   - if (QpczlxEnum.mplq.getCode().equals(lx) && QpztEnum.kp.getInfo().equals(wQpssxx.getFCtzt())) {
459   - if (enable) {
  462 + if (QpczlxEnum.mplq.getCode().equals(lx) && QpztEnum.kp.getCode().equals(wQpssxx.getFCtzt())) {
  463 + if (qpczEnable) {
460 464 wQpssxx = wQpssxxManager.getQpczxx(wQpxx,wQpssxx);
461 465 }
462   - if (QpztEnum.kp.getInfo().equals(wQpssxx.getFCtzt())) {
  466 + if (QpztEnum.kp.getCode().equals(wQpssxx.getFCtzt())) {
463 467 throw new RuntimeException("气瓶条码：" + wQpxx.getFQptm() + "，为空瓶，不可满瓶领取");
464 468 }
465 469 }
466 470 }
467 471  
468 472 private void kphs_mphs_check(WQpssxx wQpssxx, WDd wDd) {
469   - if (!QpcyzlxEnum.hy.getInfo().equals(wQpssxx.getFCyzlx())) {
  473 + if (!QpcyzlxEnum.hy.getCode().equals(wQpssxx.getFCyzlx())) {
470 474 throw new RuntimeException("气瓶不属于此会员，无法回收");
471 475 }
472 476 if (wDd != null) {
... ... @@ -479,22 +483,22 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
479 483 private void mpfc_check(ArrayList<String> orgIdList, WYgxx wYgxx, WQpssxx wQpssxx, WDd wDd) {
480 484 if (wDd != null) {
481 485 String fPsfs = wDd.getFPsfs();
482   - if (DdpsfsEnum.zt.getInfo().equals(fPsfs)) {
483   - if (!QpcyzlxEnum.cz.getInfo().equals(wQpssxx.getFCyzlx())) {
  486 + if (DdpsfsEnum.zt.getCode().equals(fPsfs)) {
  487 + if (!QpcyzlxEnum.cz.getCode().equals(wQpssxx.getFCyzlx())) {
484 488 throw new RuntimeException("气瓶不在厂站，无法发出");
485 489 }
486 490 if (!orgIdList.contains(wQpssxx.getFCyczid())) {
487 491 throw new RuntimeException("气瓶实时厂站与员工当前组织不一致，无法发出");
488 492 }
489 493 }
490   - if (DdpsfsEnum.ps.getInfo().equals(fPsfs)) {
491   - if (!QpcyzlxEnum.yg.getInfo().equals(wQpssxx.getFCyzlx())) {
  494 + if (DdpsfsEnum.ps.getCode().equals(fPsfs)) {
  495 + if (!QpcyzlxEnum.yg.getCode().equals(wQpssxx.getFCyzlx())) {
492 496 throw new RuntimeException("员工未领取气瓶，无法发出");
493 497 }
494 498 if (!wYgxx.getFUserid().equals(wQpssxx.getFCyyhid())) {
495 499 throw new RuntimeException("员工未领取气瓶，无法发出");
496 500 }
497   - if (QpztEnum.kp.getInfo().equals(wQpssxx.getFCtzt())) {
  501 + if (QpztEnum.kp.getCode().equals(wQpssxx.getFCtzt())) {
498 502 throw new RuntimeException("空瓶无法发出");
499 503 }
500 504 }
... ... @@ -507,13 +511,13 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
507 511 IUser currentUser = script.getCurrentUser();
508 512 WYgxx wygxx = wCurrentInfoManager.getCurrentWygxxByUserId(currentUser.getUserId());
509 513 if (wygxx != null) {
510   - if (YglxEnum.czyg.getInfo().equals(wygxx.getFSslx())) {
  514 + if (YglxEnum.czyg.getCode().equals(wygxx.getFSslx())) {
511 515 rylx = YglxEnum.czyg.getCode();
512 516 if (StringUtil.isEmpty(qyId) && StringUtil.isEmpty(qzId)) {
513 517 qzId = wygxx.getFSsczid();
514 518 }
515 519 }
516   - if (YglxEnum.qyyg.getInfo().equals(wygxx.getFSslx())) {
  520 + if (YglxEnum.qyyg.getCode().equals(wygxx.getFSslx())) {
517 521 rylx = YglxEnum.qyyg.getCode();
518 522 if (StringUtil.isEmpty(qyId)) {
519 523 qyId = wygxx.getFSsqyid();
... ... @@ -529,9 +533,9 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
529 533 map.put("qzmc", v.get(0).getFSsczmc());
530 534 map.put("qzid", v.get(0).getFSsczid());
531 535 //本厂站气瓶还在本厂站的气瓶
532   - List<QpdtVo> typeone_collect = v.stream().filter(a -> k.equals(a.getFCyczID()) && "厂站".equals(a.getFCyzlx())).collect(Collectors.toList());
  536 + List<QpdtVo> typeone_collect = v.stream().filter(a -> k.equals(a.getFCyczID()) && QpcyzlxEnum.cz.getCode().equals(a.getFCyzlx())).collect(Collectors.toList());
533 537 //本厂站气瓶不在本厂站的气瓶（在会员手中或者在其他厂站中）
534   - List<QpdtVo> typetwo_collect = v.stream().filter(a -> "会员".equals(a.getFCyzlx()) || !k.equals(a.getFCyczID())).collect(Collectors.toList());//不包含在员工手中正在配送的气瓶
  538 + List<QpdtVo> typetwo_collect = v.stream().filter(a -> QpcyzlxEnum.hy.getCode().equals(a.getFCyzlx()) || !k.equals(a.getFCyczID())).collect(Collectors.toList());//不包含在员工手中正在配送的气瓶
535 539 // typetwoHandler(typetwo_collect);
536 540 //其他厂站在本厂站的气瓶
537 541 List<QpdtVo> typethree_collect = getTypethreeCollect(k);
... ... @@ -554,7 +558,7 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
554 558 QpssxxDto qpssxxDto = new QpssxxDto();
555 559 BeanUtil.copyProperties(wQpssxx, qpssxxDto);
556 560 qpssxxDto.setFZqbh(UniqueIdUtil.getSuid());
557   - qpssxxDto.setFCtzt(QpztEnum.mp.getInfo());
  561 + qpssxxDto.setFCtzt(QpztEnum.mp.getCode());
558 562 qpssxxDto.setFLzmc(QplzjdmcEnum.qpcz.getInfo());
559 563 wQpssxxManager.createOrUpdate(qpssxxDto);
560 564 }
... ... @@ -567,6 +571,10 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
567 571 if (wygxx == null) {
568 572 throw new RuntimeException("员工信息不存在");
569 573 }
  574 + WCzxx wczxx = wCzxxManager.getById(wygxx.getFSsczid());
  575 + if (wczxx == null ) {
  576 + throw new RuntimeException("厂站信息不存在");
  577 + }
570 578 LocalDateTime now = LocalDateTime.now();
571 579 List<String> mp = receiveQpRequest.getMp();
572 580 List<String> kp = receiveQpRequest.getKp();
... ... @@ -582,18 +590,19 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
582 590 if (wqpssxx == null) {
583 591 throw new RuntimeException("气瓶条码：" + qptm + "，气瓶实时信息不存在");
584 592 }
585   - if (QpztEnum.kp.getInfo().equals(wqpssxx.getFCtzt())) {
  593 + if (QpztEnum.kp.getCode().equals(wqpssxx.getFCtzt())) {
586 594 wqpssxx = wQpssxxManager.getQpczxx(wQpxx, wqpssxx);
587   - if (QpztEnum.kp.getInfo().equals(wqpssxx.getFCtzt())) {
  595 + if (QpztEnum.kp.getCode().equals(wqpssxx.getFCtzt())) {
588 596 throw new RuntimeException("气瓶条码：" + qptm + "，为空瓶，不可满瓶领取");
589 597 }
590 598 }
591 599 }
592 600 }
593   - qplzcz(mp, QpztEnum.mp.getInfo(), wygxx, now, QplzjdmcEnum.sqglmp.getInfo(), QpcyzlxEnum.yg.getInfo(), wygxx.getFUserid());
  601 +// qplzcz(mp, QpztEnum.mp.getInfo(), wygxx, now, QplzjdmcEnum.sqglmp.getInfo(), QpcyzlxEnum.yg.getCode(), wygxx.getFUserid());
  602 + qplzcz(mp, QpztEnum.mp.getCode(), wygxx, now, QpStateMachineNext.getNext(QpEventEnum.lq, QpHolderEnum.gyz.getCode().equals(wczxx.getFCzlx()) ? QpHolderEnum.gyz : QpHolderEnum.czz, QpStateEnum.mp,QpHolderEnum.gyz.getCode().equals(wczxx.getFCzlx()) ? QpHolderEnum.gyz : QpHolderEnum.czz).getInfo(), QpcyzlxEnum.yg.getInfo(), wygxx.getFUserid());
594 603 }
595 604 if (CollectionUtils.isNotEmpty(kp)) {
596   - qplzcz(kp, QpztEnum.kp.getInfo(), wygxx, now, QplzjdmcEnum.sqglkp.getInfo(), QpcyzlxEnum.yg.getInfo(), wygxx.getFUserid());
  605 + qplzcz(kp, QpztEnum.kp.getCode(), wygxx, now, QplzjdmcEnum.sqglkp.getInfo(), QpcyzlxEnum.yg.getCode(), wygxx.getFUserid());
597 606 }
598 607 }
599 608  
... ... @@ -605,7 +614,7 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
605 614 }
606 615 QpxxVo qpxxVo = this.getQpxxByid(wQpxx.getId());
607 616 WQpssxx qpssxx = qpxxVo.getQpssxx();
608   - if (qpssxx != null && QpcyzlxEnum.hy.getInfo().equals(qpssxx.getFCyzlx())) {
  617 + if (qpssxx != null && QpcyzlxEnum.hy.getCode().equals(qpssxx.getFCyzlx())) {
609 618 List<WDdpsxq> list = wDdpsxqManager.list(Wrappers.<WDdpsxq>lambdaQuery().eq(WDdpsxq::getFQpid, wQpxx.getId()).orderByDesc(WDdpsxq::getFCjsj));
610 619 if (CollectionUtils.isNotEmpty(list)) {
611 620 WDdpsxq wDdpsxq = list.get(0);
... ... @@ -661,24 +670,24 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
661 670  
662 671 //获取员工所在厂站类型，根据数据来操作气瓶信息
663 672 String czlx = wCzxx.getFCzlx();
664   - if (!CzlxEnum.czz.getInfo().equals(czlx) && !CzlxEnum.gyz.getInfo().equals(czlx)) {
  673 + if (!CzlxEnum.czz.getCode().equals(czlx) && !CzlxEnum.gyz.getCode().equals(czlx)) {
665 674 throw new RuntimeException("厂站类型有误");
666 675 }
667 676 if (enable) {
668 677 synQpData(mprk, kprk, wYgxx, wCzxx);
669 678 }
670 679 LocalDateTime now = LocalDateTime.now();
671   - if (CzlxEnum.czz.getInfo().equals(czlx)) {
672   - qplzcz(kpck, QpztEnum.kp.getInfo(), wYgxx, now, QplzjdmcEnum.kphsgyz.getInfo(), QpcyzlxEnum.cl.getInfo(), qpInAndOutCzDTO.getClId());
673   - qplzcz(mpck, QpztEnum.mp.getInfo(), wYgxx, now, QplzjdmcEnum.mpcz.getInfo(), QpcyzlxEnum.cl.getInfo(), qpInAndOutCzDTO.getClId());
674   - qplzcz(kprk, QpztEnum.kp.getInfo(), wYgxx, now, QplzjdmcEnum.czzkphs.getInfo(), QpcyzlxEnum.cz.getInfo(), wCzxx.getId());
675   - qplzcz(mprk, QpztEnum.mp.getInfo(), wYgxx, now, QplzjdmcEnum.czzmprk.getInfo(), QpcyzlxEnum.cz.getInfo(), wCzxx.getId());
676   - }
677   - if (CzlxEnum.gyz.getInfo().equals(czlx)) {
678   - qplzcz(kpck, QpztEnum.kp.getInfo(), wYgxx, now, QplzjdmcEnum.kpcz.getInfo(), QpcyzlxEnum.cl.getInfo(), qpInAndOutCzDTO.getClId());
679   - qplzcz(mpck, QpztEnum.mp.getInfo(), wYgxx, now, QplzjdmcEnum.mpcz.getInfo(), QpcyzlxEnum.cl.getInfo(), qpInAndOutCzDTO.getClId());
680   - qplzcz(kprk, QpztEnum.kp.getInfo(), wYgxx, now, QplzjdmcEnum.kphsgyz.getInfo(), QpcyzlxEnum.cz.getInfo(), wCzxx.getId());
681   - qplzcz(mprk, QpztEnum.mp.getInfo(), wYgxx, now, QplzjdmcEnum.gyzmprk.getInfo(), QpcyzlxEnum.cz.getInfo(), wCzxx.getId());
  680 + if (CzlxEnum.czz.getCode().equals(czlx)) {
  681 + qplzcz(kpck, QpztEnum.kp.getCode(), wYgxx, now, QplzjdmcEnum.kphsgyz.getInfo(), QpcyzlxEnum.cl.getCode(), qpInAndOutCzDTO.getClId());
  682 + qplzcz(mpck, QpztEnum.mp.getCode(), wYgxx, now, QplzjdmcEnum.mpcz.getInfo(), QpcyzlxEnum.cl.getCode(), qpInAndOutCzDTO.getClId());
  683 + qplzcz(kprk, QpztEnum.kp.getCode(), wYgxx, now, QplzjdmcEnum.czzkphs.getInfo(), QpcyzlxEnum.cz.getCode(), wCzxx.getId());
  684 + qplzcz(mprk, QpztEnum.mp.getCode(), wYgxx, now, QplzjdmcEnum.czzmprk.getInfo(), QpcyzlxEnum.cz.getCode(), wCzxx.getId());
  685 + }
  686 + if (CzlxEnum.gyz.getCode().equals(czlx)) {
  687 + qplzcz(kpck, QpztEnum.kp.getCode(), wYgxx, now, QplzjdmcEnum.kpcz.getInfo(), QpcyzlxEnum.cl.getCode(), qpInAndOutCzDTO.getClId());
  688 + qplzcz(mpck, QpztEnum.mp.getCode(), wYgxx, now, QplzjdmcEnum.mpcz.getInfo(), QpcyzlxEnum.cl.getCode(), qpInAndOutCzDTO.getClId());
  689 + qplzcz(kprk, QpztEnum.kp.getCode(), wYgxx, now, QplzjdmcEnum.kphsgyz.getInfo(), QpcyzlxEnum.cz.getCode(), wCzxx.getId());
  690 + qplzcz(mprk, QpztEnum.mp.getCode(), wYgxx, now, QplzjdmcEnum.gyzmprk.getInfo(), QpcyzlxEnum.cz.getCode(), wCzxx.getId());
682 691 }
683 692 }
684 693  
... ... @@ -702,7 +711,7 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
702 711 mp_remove.add(qptm);
703 712 continue;
704 713 }
705   - WQpssxx wQpssxx = structureQpxx(qptm, wYgxx, qpBaseInfo, wQpxx, wCzxx, QpztEnum.mp.getInfo());
  714 + WQpssxx wQpssxx = structureQpxx(qptm, wYgxx, qpBaseInfo, wQpxx, wCzxx, QpztEnum.mp.getCode());
706 715 wQpssxx = wQpssxxManager.getQpczxx(wQpxx,wQpssxx);
707 716 }
708 717 }
... ... @@ -719,7 +728,7 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
719 728 kp_remove.add(qptm);
720 729 continue;
721 730 }
722   - WQpssxx wQpssxx = structureQpxx(qptm, wYgxx, qpBaseInfo, wQpxx, wCzxx, QpztEnum.kp.getInfo());
  731 + WQpssxx wQpssxx = structureQpxx(qptm, wYgxx, qpBaseInfo, wQpxx, wCzxx, QpztEnum.kp.getCode());
723 732 wQpssxx = wQpssxxManager.getQpczxx(wQpxx,wQpssxx);
724 733 }
725 734 }
... ... @@ -738,7 +747,7 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
738 747 List<WQpxx> wQpxxList = baseMapper.listScrapQp();
739 748 if (CollectionUtils.isNotEmpty(wQpxxList)) {
740 749 for (WQpxx wQpxx : wQpxxList) {
741   - wQpxx.setFZt("报废");
  750 + wQpxx.setFZt(QpztEnum.bf.getInfo());
742 751 }
743 752 this.saveOrUpdateBatch(wQpxxList);
744 753 }
... ... @@ -835,13 +844,15 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
835 844 throw new RuntimeException("气瓶信息未传入");
836 845 }
837 846 ArrayList<QpxxDTO> qpxxDTOS = getQpxxDTOS(mplqList, wYgxx, wczxx,QpczlxEnum.mplq.getCode());
838   - qplzcz_new(qpxxDTOS, QpztEnum.mp.getInfo(), wYgxx, now, QplzjdmcEnum.sqglmp.getInfo(), QpcyzlxEnum.yg.getInfo(), wYgxx.getFUserid());
  847 +// qplzcz_new(qpxxDTOS, QpztEnum.mp.getCode(), wYgxx, now, QplzjdmcEnum.sqglmp.getInfo(), QpcyzlxEnum.yg.getCode(), wYgxx.getFUserid());
  848 + qplzcz_new(qpxxDTOS, QpztEnum.mp.getCode(), wYgxx, now, QpStateMachineNext.getNext(QpEventEnum.lq, QpHolderEnum.gyz.getCode().equals(wczxx.getFCzlx()) ? QpHolderEnum.gyz : QpHolderEnum.czz, QpStateEnum.mp,QpHolderEnum.gyz.getInfo().equals(wczxx.getFCzlx()) ? QpHolderEnum.gyz : QpHolderEnum.czz).getInfo(), QpcyzlxEnum.yg.getInfo(), wYgxx.getFUserid());
839 849 } else if (QpczlxEnum.kplq.getCode().equals(qpczDTO.getCzlx())) {
840 850 if (ObjectUtil.isEmpty(kplqList)) {
841 851 throw new RuntimeException("气瓶信息未传入");
842 852 }
843 853 ArrayList<QpxxDTO> qpxxDTOS = getQpxxDTOS(kplqList, wYgxx, wczxx,QpczlxEnum.kplq.getCode());
844   - qplzcz_new(qpxxDTOS, QpztEnum.kp.getInfo(), wYgxx, now, QplzjdmcEnum.kphssqg.getInfo(), QpcyzlxEnum.yg.getInfo(), wYgxx.getFUserid());
  854 +// qplzcz_new(qpxxDTOS, QpztEnum.kp.getCode(), wYgxx, now, QplzjdmcEnum.kphssqg.getInfo(), QpcyzlxEnum.yg.getCode(), wYgxx.getFUserid());
  855 + qplzcz_new(qpxxDTOS, QpztEnum.kp.getCode(), wYgxx, now, QpStateMachineNext.getNext(QpEventEnum.lq, QpHolderEnum.gyz.getCode().equals(wczxx.getFCzlx()) ? QpHolderEnum.gyz : QpHolderEnum.czz, QpStateEnum.kp,QpHolderEnum.gyz.getInfo().equals(wczxx.getFCzlx()) ? QpHolderEnum.gyz : QpHolderEnum.czz).getInfo(), QpcyzlxEnum.yg.getInfo(), wYgxx.getFUserid());
845 856 } else if (QpczlxEnum.rk.getCode().equals(qpczDTO.getCzlx())) {
846 857 if (ObjectUtil.isEmpty(qpczDTO.getCzId())) {
847 858 throw new RuntimeException("请传入厂站信息");
... ... @@ -859,11 +870,13 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
859 870 }
860 871 if (ObjectUtil.isNotEmpty(mprkList)) {
861 872 ArrayList<QpxxDTO> qpxxDTOS = getQpxxDTOS(mprkList, wYgxx, wczxx,QpczlxEnum.mprk.getCode());
862   - qplzcz_new(qpxxDTOS, QpztEnum.mp.getInfo(), wYgxx, now, CzlxEnum.czz.getInfo().equals(wczxx.getFCzlx()) ? QplzjdmcEnum.czzmprk.getInfo() : QplzjdmcEnum.gyzmprk.getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId());
  873 +// qplzcz_new(qpxxDTOS, QpztEnum.mp.getCode(), wYgxx, now, CzlxEnum.czz.getInfo().equals(wczxx.getFCzlx()) ? QplzjdmcEnum.czzmprk.getInfo() : QplzjdmcEnum.gyzmprk.getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId());
  874 + qplzcz_new(qpxxDTOS, QpztEnum.mp.getCode(), wYgxx, now, QpStateMachineNext.getNext(QpEventEnum.rk, QpHolderEnum.cl, QpStateEnum.mp,QpHolderEnum.gyz.getCode().equals(wczxx.getFCzlx()) ? QpHolderEnum.gyz : QpHolderEnum.czz).getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId());
863 875 }
864 876 if (ObjectUtil.isNotEmpty(kprkList)) {
865 877 ArrayList<QpxxDTO> qpxxDTOS = getQpxxDTOS(kprkList, wYgxx, wczxx,QpczlxEnum.kprk.getCode());
866   - qplzcz_new(qpxxDTOS, QpztEnum.kp.getInfo(), wYgxx, now, CzlxEnum.czz.getInfo().equals(wczxx.getFCzlx()) ? QplzjdmcEnum.czzkphs.getInfo() : QplzjdmcEnum.kphsgyz.getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId());
  878 +// qplzcz_new(qpxxDTOS, QpztEnum.kp.getCode(), wYgxx, now, CzlxEnum.czz.getInfo().equals(wczxx.getFCzlx()) ? QplzjdmcEnum.czzkphs.getInfo() : QplzjdmcEnum.kphsgyz.getInfo(), QpcyzlxEnum.cz.getCode(), wczxx.getId());
  879 + qplzcz_new(qpxxDTOS, QpztEnum.kp.getCode(), wYgxx, now, QpStateMachineNext.getNext(QpEventEnum.rk, QpHolderEnum.yg, QpStateEnum.kp,QpHolderEnum.gyz.getCode().equals(wczxx.getFCzlx()) ? QpHolderEnum.gyz : QpHolderEnum.czz).getInfo(), QpcyzlxEnum.cz.getInfo(), wczxx.getId());
867 880 }
868 881 if (ObjectUtil.isEmpty(mprkList) && ObjectUtil.isEmpty(kprkList)) {
869 882 throw new RuntimeException("请传入气瓶信息");
... ... @@ -887,11 +900,13 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
887 900 }
888 901 if (ObjectUtil.isNotEmpty(mpckList)) {
889 902 ArrayList<QpxxDTO> qpxxDTOS = getQpxxDTOS(mpckList, wYgxx, wczxx,QpczlxEnum.ck.getCode());
890   - qplzcz_new(qpxxDTOS, QpztEnum.mp.getInfo(), wYgxx, now, QplzjdmcEnum.mpcz.getInfo(), QpcyzlxEnum.cl.getInfo(), wClxx.getId());
  903 +// qplzcz_new(qpxxDTOS, QpztEnum.mp.getCode(), wYgxx, now, QplzjdmcEnum.mpcz.getInfo(), QpcyzlxEnum.cl.getCode(), wClxx.getId());
  904 + qplzcz_new(qpxxDTOS, QpztEnum.mp.getCode(), wYgxx, now, QpStateMachineNext.getNext(QpEventEnum.ck, QpHolderEnum.gyz.getCode().equals(wczxx.getFCzlx()) ? QpHolderEnum.gyz : QpHolderEnum.czz, QpStateEnum.mp,QpHolderEnum.gyz.getCode().equals(wczxx.getFCzlx()) ? QpHolderEnum.gyz : QpHolderEnum.czz).getInfo(), QpcyzlxEnum.cl.getInfo(), wClxx.getId());
891 905 }
892 906 if (ObjectUtil.isNotEmpty(kpckList)) {
893 907 ArrayList<QpxxDTO> qpxxDTOS = getQpxxDTOS(kpckList, wYgxx, wczxx,QpczlxEnum.ck.getCode());
894   - qplzcz_new(qpxxDTOS, QpztEnum.kp.getInfo(), wYgxx, now, QplzjdmcEnum.kpcz.getInfo(), QpcyzlxEnum.cl.getInfo(), wClxx.getId());
  908 +// qplzcz_new(qpxxDTOS, QpztEnum.kp.getCode(), wYgxx, now, QplzjdmcEnum.kpcz.getInfo(), QpcyzlxEnum.cl.getCode(), wClxx.getId());
  909 + qplzcz_new(qpxxDTOS, QpztEnum.kp.getCode(), wYgxx, now, QpStateMachineNext.getNext(QpEventEnum.ck, QpHolderEnum.gyz.getCode().equals(wczxx.getFCzlx()) ? QpHolderEnum.gyz : QpHolderEnum.czz, QpStateEnum.kp,QpHolderEnum.gyz.getCode().equals(wczxx.getFCzlx()) ? QpHolderEnum.gyz : QpHolderEnum.czz).getInfo(), QpcyzlxEnum.cl.getInfo(), wClxx.getId());
895 910 }
896 911 if (ObjectUtil.isEmpty(mpckList) && ObjectUtil.isEmpty(kpckList)) {
897 912 throw new RuntimeException("请传入气瓶信息");
... ... @@ -918,9 +933,9 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
918 933 if (wqpssxx == null) {
919 934 throw new RuntimeException("气瓶条码：" + wQpxx.getFQptm() + "，气瓶实时信息不存在");
920 935 }
921   - if (QpztEnum.kp.getInfo().equals(wqpssxx.getFCtzt()) && QpczlxEnum.mplq.getCode().equals(czlx)) {//只有满瓶领取的时候走这一层处理
  936 + if (QpztEnum.kp.getCode().equals(wqpssxx.getFCtzt()) && QpczlxEnum.mplq.getCode().equals(czlx)) {//只有满瓶领取的时候走这一层处理
922 937 wqpssxx = wQpssxxManager.getQpczxx(wQpxx, wqpssxx);
923   - if (QpztEnum.kp.getInfo().equals(wqpssxx.getFCtzt())) {
  938 + if (QpztEnum.kp.getCode().equals(wqpssxx.getFCtzt())) {
924 939 throw new RuntimeException("气瓶条码：" + wQpxx.getFQptm() + "，为空瓶，不可满瓶领取");
925 940 }
926 941 }
... ... @@ -940,7 +955,7 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
940 955 if (ObjectUtil.isEmpty(qpBaseInfo)) {
941 956 throw new RuntimeException("气瓶条码：" + wQpxx.getFQptm() + "，气瓶信息不存在");
942 957 } else {
943   - wqpssxx = structureQpxx(wQpxx.getFQptm(), wYgxx, qpBaseInfo, wQpxx, wczxx, QpztEnum.mp.getInfo());
  958 + wqpssxx = structureQpxx(wQpxx.getFQptm(), wYgxx, qpBaseInfo, wQpxx, wczxx, QpztEnum.mp.getCode());
944 959 wqpssxx = wQpssxxManager.getQpczxx(wQpxx,wqpssxx);
945 960 }
946 961 if(QpczlxEnum.mprk.getCode().equals(czlx)) {
... ... @@ -996,11 +1011,11 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
996 1011 throw new RuntimeException("气瓶条码：" + qptm + "，气瓶信息信息不存在");
997 1012 }
998 1013 wQpssxx.setFCyzlx(qpcyzlx);
999   - if (QpcyzlxEnum.yg.getInfo().equals(qpcyzlx) || QpcyzlxEnum.hy.getInfo().equals(qpcyzlx)) {
  1014 + if (QpcyzlxEnum.yg.getCode().equals(qpcyzlx) || QpcyzlxEnum.hy.getCode().equals(qpcyzlx)) {
1000 1015 wQpssxx.setFCyyhid(qpcyzId);
1001   - } else if (QpcyzlxEnum.cz.getInfo().equals(qpcyzlx)) {
  1016 + } else if (QpcyzlxEnum.cz.getCode().equals(qpcyzlx)) {
1002 1017 wQpssxx.setFCyczid(qpcyzId);
1003   - } else if (QpcyzlxEnum.cl.getInfo().equals(qpcyzlx)) {
  1018 + } else if (QpcyzlxEnum.cl.getCode().equals(qpcyzlx)) {
1004 1019 wQpssxx.setFCyclID(qpcyzId);
1005 1020 }
1006 1021 wQpssxx.setFCtzt(qpzt);
... ... @@ -1020,11 +1035,11 @@ public class WQpxxManagerImpl extends BaseManagerImpl&lt;WQpxxDao, WQpxx&gt; implement
1020 1035 WQpxx wQpxx = qpxxDTO.getWQpxx();
1021 1036 WQpssxx wQpssxx = qpxxDTO.getWQpssxx();
1022 1037 wQpssxx.setFCyzlx(qpcyzlx);
1023   - if (QpcyzlxEnum.yg.getInfo().equals(qpcyzlx) || QpcyzlxEnum.hy.getInfo().equals(qpcyzlx)) {
  1038 + if (QpcyzlxEnum.yg.getCode().equals(qpcyzlx) || QpcyzlxEnum.hy.getCode().equals(qpcyzlx)) {
1024 1039 wQpssxx.setFCyyhid(qpcyzId);
1025   - } else if (QpcyzlxEnum.cz.getInfo().equals(qpcyzlx)) {
  1040 + } else if (QpcyzlxEnum.cz.getCode().equals(qpcyzlx)) {
1026 1041 wQpssxx.setFCyczid(qpcyzId);
1027   - } else if (QpcyzlxEnum.cl.getInfo().equals(qpcyzlx)) {
  1042 + } else if (QpcyzlxEnum.cl.getCode().equals(qpcyzlx)) {
1028 1043 wQpssxx.setFCyclID(qpcyzId);
1029 1044 }
1030 1045 wQpssxx.setFCtzt(qpzt);
... ...
backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WStaffStatisticsManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -106,22 +106,22 @@ public class WStaffStatisticsManagerImpl implements WStaffStatisticsManager {
106 106 mpps = wQplzManager.count(Wrappers.<WQplz>lambdaQuery().between(WQplz::getFCzsj, startDate, endDate).eq(WQplz::getFCzrid, wYgxx.getFUserid()).eq(WQplz::getFLzmc, QplzjdmcEnum.smps.getInfo()));
107 107 kphs = wQplzManager.count(Wrappers.<WQplz>lambdaQuery().between(WQplz::getFCzsj, startDate, endDate).eq(WQplz::getFCzrid, wYgxx.getFUserid()).eq(WQplz::getFLzmc, QplzjdmcEnum.kphssqg.getInfo()));
108 108 mphs = wQplzManager.count(Wrappers.<WQplz>lambdaQuery().between(WQplz::getFCzsj, startDate, endDate).eq(WQplz::getFCzrid, wYgxx.getFUserid()).eq(WQplz::getFLzmc, QplzjdmcEnum.mphssqg.getInfo()));
109   - ddps = wDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).eq(WDd::getFPsrid, wYgxx.getId()).eq(WDd::getFDdly, DdlyEnum.xsxd.getInfo()));
110   - wdaz = wDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).eq(WDd::getFPsrid, wYgxx.getId()).eq(WDd::getFDdly, DdlyEnum.wdps.getInfo()));
111   - bzxd = wDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).eq(WDd::getFPsrid, wYgxx.getId()).eq(WDd::getFDdly, DdlyEnum.bzxd.getInfo()));
  109 + ddps = wDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).eq(WDd::getFPsrid, wYgxx.getId()).eq(WDd::getFDdly, DdlyEnum.xsxd.getCode()));
  110 + wdaz = wDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).eq(WDd::getFPsrid, wYgxx.getId()).eq(WDd::getFDdly, DdlyEnum.wdps.getCode()));
  111 + bzxd = wDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).eq(WDd::getFPsrid, wYgxx.getId()).eq(WDd::getFDdly, DdlyEnum.bzxd.getCode()));
112 112 count = wDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).eq(WDd::getFPsrid, wYgxx.getId()));
113   - xsxd = wDdDao.statistics(wYgxx, startDate, endDate, DdlyEnum.xsxd.getInfo(),null);
114   - wdps = wDdDao.statistics(wYgxx, startDate, endDate, DdlyEnum.wdps.getInfo(),null);
  113 + xsxd = wDdDao.statistics(wYgxx, startDate, endDate, DdlyEnum.xsxd.getCode(),null);
  114 + wdps = wDdDao.statistics(wYgxx, startDate, endDate, DdlyEnum.wdps.getCode(),null);
115 115 } else {
116 116 mpps = wQplzManager.count(Wrappers.<WQplz>lambdaQuery().between(WQplz::getFCzsj, startDate, endDate).in(WQplz::getFCyczid,orgIdList).eq(WQplz::getFLzmc, QplzjdmcEnum.smps.getInfo()));
117 117 kphs = wQplzManager.count(Wrappers.<WQplz>lambdaQuery().between(WQplz::getFCzsj, startDate, endDate).in(WQplz::getFCyczid,orgIdList).eq(WQplz::getFLzmc, QplzjdmcEnum.kphssqg.getInfo()));
118 118 mphs = wQplzManager.count(Wrappers.<WQplz>lambdaQuery().between(WQplz::getFCzsj, startDate, endDate).in(WQplz::getFCyczid,orgIdList).eq(WQplz::getFLzmc, QplzjdmcEnum.mphssqg.getInfo()));
119   - ddps = wDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).in(WDd::getFCzid,orgIdList).eq(WDd::getFDdly, DdlyEnum.xsxd.getInfo()));
120   - wdaz = wDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).in(WDd::getFCzid,orgIdList).eq(WDd::getFDdly, DdlyEnum.wdps.getInfo()));
121   - bzxd = wDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).in(WDd::getFCzid,orgIdList).eq(WDd::getFDdly, DdlyEnum.bzxd.getInfo()));
  119 + ddps = wDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).in(WDd::getFCzid,orgIdList).eq(WDd::getFDdly, DdlyEnum.xsxd.getCode()));
  120 + wdaz = wDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).in(WDd::getFCzid,orgIdList).eq(WDd::getFDdly, DdlyEnum.wdps.getCode()));
  121 + bzxd = wDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).in(WDd::getFCzid,orgIdList).eq(WDd::getFDdly, DdlyEnum.bzxd.getCode()));
122 122 count = wDdManager.count(Wrappers.<WDd>lambdaQuery().between(WDd::getFSjwcsj, startDate, endDate).in(WDd::getFCzid,orgIdList));
123   - xsxd = wDdDao.statistics(wYgxx, startDate, endDate, DdlyEnum.xsxd.getInfo(),orgIdList);
124   - wdps = wDdDao.statistics(wYgxx, startDate, endDate, DdlyEnum.wdps.getInfo(),orgIdList);
  123 + xsxd = wDdDao.statistics(wYgxx, startDate, endDate, DdlyEnum.xsxd.getCode(),orgIdList);
  124 + wdps = wDdDao.statistics(wYgxx, startDate, endDate, DdlyEnum.wdps.getCode(),orgIdList);
125 125 }
126 126 HashMap<String, Object> map = new HashMap<>();
127 127 map.put("mpps", mpps);
... ...
backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WTqglManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -77,7 +77,7 @@ public class WTqglManagerImpl extends BaseManagerImpl&lt;WTqglDao, WTqgl&gt; implement
77 77 if (wHyyqjl == null) {
78 78 throw new RuntimeException("会员用气记录不存在");
79 79 }
80   - if (QpztEnum.ygh.equals(wHyyqjl.getFZt())) {
  80 + if (QpztEnum.ygh.getCode().equals(wHyyqjl.getFZt())) {
81 81 throw new RuntimeException("此状态下不允许提交退气");
82 82 }
83 83 List<WTqgl> wTqgls = baseMapper.selectList(Wrappers.<WTqgl>lambdaQuery().eq(WTqgl::getFHyyqjlid, id));
... ... @@ -114,9 +114,9 @@ public class WTqglManagerImpl extends BaseManagerImpl&lt;WTqglDao, WTqgl&gt; implement
114 114 wTqgl.setFWd(wdd.getFShdzwd());
115 115 }
116 116 wTqgl.setFDdid(wHyyqjl.getFDdid());
117   - wTqgl.setFZt(QpztEnum.dhs.getInfo());
  117 + wTqgl.setFZt(QpztEnum.dhs.getCode());
118 118 baseMapper.insert(wTqgl);
119   - wHyyqjl.setFZt(QpztEnum.tqz.getInfo());
  119 + wHyyqjl.setFZt(QpztEnum.tqz.getCode());
120 120 wHyyqjlManager.updateById(wHyyqjl);
121 121 }
122 122  
... ... @@ -135,7 +135,7 @@ public class WTqglManagerImpl extends BaseManagerImpl&lt;WTqglDao, WTqgl&gt; implement
135 135 if (wTqgl == null) {
136 136 throw new RuntimeException("退气信息不存在");
137 137 }
138   - wTqgl.setFZt(QpztEnum.yhs.getInfo());
  138 + wTqgl.setFZt(QpztEnum.yhs.getCode());
139 139  
140 140 QpssxxDto qpssxxDto = new QpssxxDto();
141 141 qpssxxDto.setFLzmc(QplzjdmcEnum.kphssqg.getInfo());
... ... @@ -147,9 +147,9 @@ public class WTqglManagerImpl extends BaseManagerImpl&lt;WTqglDao, WTqgl&gt; implement
147 147 if (wCzxx == null) {
148 148 throw new RuntimeException("员工当前厂站信息不存在");
149 149 }
150   - wQpssxx.setFCyzlx(QpcyzlxEnum.yg.getInfo());
  150 + wQpssxx.setFCyzlx(QpcyzlxEnum.yg.getCode());
151 151 wQpssxx.setFCyyhid(wYgxx.getFUserid());
152   - wQpssxx.setFCtzt(QpztEnum.kp.getInfo());
  152 + wQpssxx.setFCtzt(QpztEnum.kp.getCode());
153 153 wQpssxx.setFJd(wCzxx.getFJd());
154 154 wQpssxx.setFWd(wCzxx.getFWd());
155 155 wQpssxx.setFDqsf(wCzxx.getFSssf());
... ... @@ -183,8 +183,8 @@ public class WTqglManagerImpl extends BaseManagerImpl&lt;WTqglDao, WTqgl&gt; implement
183 183 }
184 184 List<String> kptm = wStaffTqglRequest.getKptm();
185 185 List<String> mptm = wStaffTqglRequest.getMptm();
186   - hs(kptm, QpztEnum.kp.getInfo(), format, wYgxx, wCzxx);
187   - hs(mptm, QpztEnum.mp.getInfo(), format, wYgxx, wCzxx);
  186 + hs(kptm, QpztEnum.kp.getCode(), format, wYgxx, wCzxx);
  187 + hs(mptm, QpztEnum.mp.getCode(), format, wYgxx, wCzxx);
188 188 }
189 189  
190 190 /**
... ... @@ -204,24 +204,24 @@ public class WTqglManagerImpl extends BaseManagerImpl&lt;WTqglDao, WTqgl&gt; implement
204 204 if (wQpssxx == null) {
205 205 throw new RuntimeException("气瓶实时信息不存在");
206 206 }
207   - if (!QpcyzlxEnum.hy.getInfo().equals(wQpssxx.getFCyzlx())) {
  207 + if (!QpcyzlxEnum.hy.getCode().equals(wQpssxx.getFCyzlx())) {
208 208 throw new RuntimeException("气瓶条码：" + wQpssxx.getFQptm() + " 实时持有者不是会员，不能执行回收操作");
209 209 }
210   - if (QpztEnum.kp.getInfo().equals(type)) {
  210 + if (QpztEnum.kp.getCode().equals(type)) {
211 211 qpssxxDto.setFLzmc(QplzjdmcEnum.kphssqg.getInfo());
212   - wQpssxx.setFCtzt(QpztEnum.kp.getInfo());
213   - } else if (QpztEnum.mp.getInfo().equals(type)) {
  212 + wQpssxx.setFCtzt(QpztEnum.kp.getCode());
  213 + } else if (QpztEnum.mp.getCode().equals(type)) {
214 214 qpssxxDto.setFLzmc(QplzjdmcEnum.mphssqg.getInfo());
215   - wQpssxx.setFCtzt(QpztEnum.mp.getInfo());
  215 + wQpssxx.setFCtzt(QpztEnum.mp.getCode());
216 216 }
217   - List<WHyyqjl> list = wHyyqjlManager.list(Wrappers.<WHyyqjl>lambdaQuery().eq(WHyyqjl::getFQptm, qptm).eq(WHyyqjl::getFZt, QpztEnum.syz.getInfo()).orderByDesc(WHyyqjl::getFCjsj));
  217 + List<WHyyqjl> list = wHyyqjlManager.list(Wrappers.<WHyyqjl>lambdaQuery().eq(WHyyqjl::getFQptm, qptm).eq(WHyyqjl::getFZt, QpztEnum.syz.getCode()).orderByDesc(WHyyqjl::getFCjsj));
218 218 log.info("会员在用气瓶，data={}", list);
219 219 for (WHyyqjl wHyyqjl : list) {
220 220 wHyyqjl.setFJssysj(format);
221   - wHyyqjl.setFZt(QpztEnum.ygh.getInfo());
  221 + wHyyqjl.setFZt(QpztEnum.ygh.getCode());
222 222 wHyyqjlManager.updateById(wHyyqjl);
223 223 }
224   - wQpssxx.setFCyzlx(QpcyzlxEnum.yg.getInfo());
  224 + wQpssxx.setFCyzlx(QpcyzlxEnum.yg.getCode());
225 225 wQpssxx.setFCyyhid(wYgxx.getFUserid());
226 226 wQpssxx.setFJd(wCzxx.getFJd());
227 227 wQpssxx.setFWd(wCzxx.getFWd());
... ... @@ -240,7 +240,11 @@ public class WTqglManagerImpl extends BaseManagerImpl&lt;WTqglDao, WTqgl&gt; implement
240 240  
241 241 @Override
242 242 public IPage<WTqgl> tqPage(Page page, WTqgl wTqgl, List<String> orgIdList) {
  243 + wTqgl.setFZt(QpztEnum.valueOf(wTqgl.getFZt()).getCode());
243 244 IPage<WTqgl> result = baseMapper.tqPage(page, wTqgl, orgIdList);
  245 + for (WTqgl record : result.getRecords()) {
  246 + record.setFZt(QpztEnum.valueOf(record.getFZt()).getInfo());
  247 + }
244 248 return result;
245 249 }
246 250 }
... ...
backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WYgxxManagerImpl.java
  Diff comments   View file @f3c368e
... ... @@ -135,7 +135,7 @@ public class WYgxxManagerImpl extends BaseManagerImpl&lt;WYgxxDao, WYgxx&gt; implement
135 135 wYgxx.setFXm(ygxxDTO.getName());
136 136 wYgxx.setFSjh(ygxxDTO.getPhone());
137 137 wYgxx.setFRzsj(ygxxDTO.getEmploymentDate());
138   - wYgxx.setFSslx(ObjectUtils.isNotEmpty(wQyxx) ? YglxEnum.qyyg.getInfo() : YglxEnum.czyg.getInfo());
  138 + wYgxx.setFSslx(ObjectUtils.isNotEmpty(wQyxx) ? YglxEnum.qyyg.getCode() : YglxEnum.czyg.getCode());
139 139 wYgxx.setFXb(ygxxDTO.getGender());
140 140 wYgxx.setFZt(ygxxDTO.getState());
141 141 wYgxx.setFSsqymc(ObjectUtils.isNotEmpty(wQyxx) ? wQyxx.getFQymc() : wCzxx.getFSsqymc());
... ... @@ -261,14 +261,14 @@ public class WYgxxManagerImpl extends BaseManagerImpl&lt;WYgxxDao, WYgxx&gt; implement
261 261 }
262 262 if (YglxEnum.qyyg.getCode().equals(yhlx)) {
263 263 if (ObjectUtil.isNotEmpty(wYgxxes)) {
264   - if (YglxEnum.qyyg.getInfo().equals(wYgxxes.get(0).getFSslx())) {
  264 + if (YglxEnum.qyyg.getCode().equals(wYgxxes.get(0).getFSslx())) {
265 265 throw new RuntimeException("手机号已被注册");
266 266 }
267 267 throw new RuntimeException("手机号已注册厂站员工");
268 268 }
269 269 } else if (YglxEnum.czyg.getCode().equals(yhlx)) {
270 270 if (ObjectUtil.isNotEmpty(wYgxxes)) {
271   - if (YglxEnum.czyg.getInfo().equals(wYgxxes.get(0).getFSslx())) {
  271 + if (YglxEnum.czyg.getCode().equals(wYgxxes.get(0).getFSslx())) {
272 272 throw new RuntimeException("手机号已被注册");
273 273 }
274 274 throw new RuntimeException("手机号已注册企业员工");
... ... @@ -370,7 +370,7 @@ public class WYgxxManagerImpl extends BaseManagerImpl&lt;WYgxxDao, WYgxx&gt; implement
370 370 WYgxx wYgxx = baseMapper.selectById(id);
371 371 YgxxVO ygxxVO = new YgxxVO();
372 372 ygxxVO.setId(wYgxx.getId());
373   - ygxxVO.setOrgId(YglxEnum.qyyg.getInfo().equalsIgnoreCase(wYgxx.getFSslx()) ? wYgxx.getFSsqyid() : wYgxx.getFSsczid());
  373 + ygxxVO.setOrgId(YglxEnum.qyyg.getCode().equalsIgnoreCase(wYgxx.getFSslx()) ? wYgxx.getFSsqyid() : wYgxx.getFSsczid());
374 374 ygxxVO.setPhone(wYgxx.getFSjh());
375 375 ygxxVO.setName(wYgxx.getFXm());
376 376 ygxxVO.setEmploymentDate(wYgxx.getFRzsj());
... ...
backend/lpg/src/main/resources/mapper/WBxbMapper.xml
  Diff comments   View file @f3c368e
... ... @@ -158,7 +158,7 @@
158 158 </if>
159 159 <if test="query.fZt != null and query.fZt != ''">
160 160 and w_bxb.F_zt = #{query.fZt}
161   - <if test="query.fZt == '已处理'.toString() and query.fWxryhid != null and query.fWxryhid != ''">
  161 + <if test="query.fZt == 'ycl'.toString() and query.fWxryhid != null and query.fWxryhid != ''">
162 162 and w_bxb.F_wxryhID = #{query.fWxryhid}
163 163 </if>
164 164 </if>
... ...
backend/lpg/src/main/resources/mapper/WDdMapper.xml
  Diff comments   View file @f3c368e
... ... @@ -166,16 +166,16 @@
166 166 <select id="ptOrderStatistics" resultType="com.hotent.lpg.model.vo.PtOrderStatisticsVO">
167 167 <if test="type != null and type == '1'.toString()">
168 168 select
169   - temp1.F_ddly as lx,
  169 + case when temp1.F_ddly = '1' then '线上下单' when temp1.F_ddly = '2' then '无单配送' when temp1.F_ddly = '3' then '帮助下单' end as lx,
170 170 concat(temp2.dateStr,':00') as dateStr,
171 171 ifnull(temp3.number,0) number
172 172 from
173 173 (
174   - select '线上下单' as F_ddly
  174 + select '1' as F_ddly
175 175 union
176   - select '无单配送'
  176 + select '2'
177 177 union
178   - select '帮助下单'
  178 + select '3'
179 179 )temp1
180 180 join
181 181 (
... ... @@ -205,16 +205,16 @@
205 205 </if>
206 206 <if test="type != null and type == '2'.toString()">
207 207 select
208   - temp1.F_ddly as lx,
  208 + case when temp1.F_ddly = '1' then '线上下单' when temp1.F_ddly = '2' then '无单配送' when temp1.F_ddly = '3' then '帮助下单' end as lx,
209 209 date_format(temp2.dateStr,'%Y.%m.%d') as dateStr,
210 210 ifnull(temp3.number,0) number
211 211 from
212 212 (
213   - select '线上下单' as F_ddly
  213 + select '1' as F_ddly
214 214 union
215   - select '无单配送'
  215 + select '2'
216 216 union
217   - select '帮助下单'
  217 + select '3'
218 218 )temp1
219 219 join
220 220 (
... ... @@ -249,16 +249,16 @@
249 249 </if>
250 250 <if test="type != null and type == '3'.toString()">
251 251 select
252   - temp1.F_ddly as lx,
  252 + case when temp1.F_ddly = '1' then '线上下单' when temp1.F_ddly = '2' then '无单配送' when temp1.F_ddly = '3' then '帮助下单' end as lx,
253 253 date_format(temp2.dateStr,'%Y.%m.%d') as dateStr,
254 254 ifnull(temp3.number,0) number
255 255 from
256 256 (
257   - select '线上下单' as F_ddly
  257 + select '1' as F_ddly
258 258 union
259   - select '无单配送'
  259 + select '2'
260 260 union
261   - select '帮助下单'
  261 + select '3'
262 262 )temp1
263 263 join
264 264 (
... ... @@ -293,16 +293,16 @@
293 293 </if>
294 294 <if test="type != null and type == '4'.toString()">
295 295 select
296   - temp1.F_ddly as lx,
  296 + case when temp1.F_ddly = '1' then '线上下单' when temp1.F_ddly = '2' then '无单配送' when temp1.F_ddly = '3' then '帮助下单' end as lx,
297 297 concat(year(sysdate()),'.',temp2.dateStr) as dateStr,
298 298 ifnull(temp3.number,0) number
299 299 from
300 300 (
301   - select '线上下单' as F_ddly
  301 + select '1' as F_ddly
302 302 union
303   - select '无单配送'
  303 + select '2'
304 304 union
305   - select '帮助下单'
  305 + select '3'
306 306 )temp1
307 307 join
308 308 (
... ...
backend/lpg/src/main/resources/mapper/WHyxxMapper.xml
  Diff comments   View file @f3c368e
... ... @@ -147,10 +147,10 @@
147 147  
148 148 <update id="automaticAuthentication">
149 149 UPDATE W_HYXX
150   - SET F_SFSMRZ = '是',
151   - F_RZZT = '已认证'
  150 + SET F_SFSMRZ = 'y',
  151 + F_RZZT = 'yrz'
152 152 WHERE
153   - F_SFSMRZ = '否' AND F_RZZT = '认证中'
  153 + F_SFSMRZ = 'n' AND F_RZZT = 'rzz'
154 154 AND DATE_FORMAT( F_TJSMRZSJ, '%Y%m%d' ) = DATE_FORMAT( DATE_SUB( SYSDATE(), INTERVAL 1 DAY ), '%Y%m%d' )
155 155 </update>
156 156 </mapper>
... ...
backend/lpg/src/main/resources/mapper/WQpssxxMapper.xml
  Diff comments   View file @f3c368e
... ... @@ -211,7 +211,7 @@
211 211 w_qpssxx.F_qplzID as fQplzId
212 212 from w_qpssxx w_qpssxx
213 213 inner join w_qpxx w_qpxx on w_qpxx.ID_ = w_qpssxx.F_qpID
214   - left join w_czxx w_czxx on w_czxx.ID_ = w_qpssxx.F_cyczID and w_qpssxx.F_cyzlx = '厂站'
  214 + left join w_czxx w_czxx on w_czxx.ID_ = w_qpssxx.F_cyczID and w_qpssxx.F_cyzlx = 'cz'
215 215 where w_qpssxx.F_cyczID = #{czId} and w_qpssxx.F_cyczID != w_qpxx.F_ssczID
216 216 </select>
217 217 </mapper>
... ...
backend/lpg/src/main/resources/mapper/WQpxxMapper.xml
  Diff comments   View file @f3c368e
... ... @@ -191,7 +191,7 @@
191 191 from w_qpxx w_qpxx
192 192 left join w_qpssxx w_qpssxx on w_qpxx.id_ = w_qpssxx.F_qpID
193 193 <where>
194   - w_qpxx.F_ssczID = #{qzId}
  194 + w_qpxx.F_ssczID = #{qzId} and w_qpxx.f_zt = '正常'
195 195 <if test="lx == 'wrk'.toString()">
196 196 and (w_qpssxx.F_cyzlx != '厂站' or (w_qpssxx.F_cyzlx = '厂站' and w_qpssxx.F_cyczID != #{qzId}))
197 197 </if>
... ...