From 303a933ae58e2057f34693d5813e4128550d1081 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期五, 03 一月 2025 20:58:25 +0800 Subject: [PATCH] zjh20250103 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java | 24 ++++- ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjXdPictureService.java | 5 + ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjXdPictureMapper.java | 24 ++++++ ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjGroupingProService.java | 2 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java | 2 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 5 + ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 54 ++++++++++-- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 12 ++ ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdPicture.java | 84 --------------------- ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjXdPictureServiceImpl.java | 10 ++ ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjGroupingProMapper.java | 8 ++ ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjGroupingProServiceImpl.java | 5 + 12 files changed, 133 insertions(+), 102 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java index 8ff0582..eb792a0 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java @@ -159,6 +159,9 @@ private TjSamplingMapper tjSamplingMapper; @Autowired private ISysConfigService sysConfigService; + @Resource + private ITjXdPictureService xdPictureService; + @Override @@ -426,6 +429,8 @@ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId()); addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser,null); + List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(order.getTjNumber()); + xdPictureService.saveBatch(xdPictureList); } public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser,String jxbz) { diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java index 9cde62d..0c391cd 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java @@ -173,10 +173,11 @@ groupingPro.setProId(map.get("proId").toString()); groupingPro.setProName(map.get("proName").toString()); groupingPro.setProPyName(PinyinUtil.getFirstLetter(map.get("proName").toString(),"")); - groupingPro.setLimits(tjDwGrouping.getLimits()); - groupingPro.setYsPrice(BigDecimal.valueOf(Long.parseLong(map.get("proPrice").toString())) - .multiply(BigDecimal.valueOf(Long.parseLong(tjDwGrouping.getLimits())) - .divide(BigDecimal.valueOf(10)))); + groupingPro.setLimits(map.get("limits").toString()); +// groupingPro.setYsPrice(BigDecimal.valueOf(Long.parseLong(map.get("proPrice").toString())) +// .multiply(BigDecimal.valueOf(Long.parseLong(tjDwGrouping.getLimits())) +// .divide(BigDecimal.valueOf(10)))); + groupingPro.setYsPrice(new BigDecimal(map.get("ysPrice").toString())); groupingProService.save(groupingPro); } } @@ -184,6 +185,18 @@ } return AjaxResult.error("鎿嶄綔澶辫触!"); } + + @GetMapping("updateGroupProLimitsByGroupId") + @ApiOperation(value = "鏍规嵁鍒嗙粍id淇敼鍒嗙粍椤圭洰琛ㄦ姌鎵�") + public AjaxResult updateGroupProLimitsByGroupId(@RequestParam @ApiParam(value = "鍒嗙粍id") String groupId, + @RequestParam @ApiParam(value = "鎶樻墸") String limits) { + boolean a= groupingProService.updateGroupProLimitsByGroupId(groupId,limits); + if(a){ + return AjaxResult.success(); + } + return AjaxResult.error(); + } + /** * 鍒犻櫎浣撴鍗曚綅鍒嗙粍 @@ -265,7 +278,8 @@ public AjaxResult getTjParentProjectList(@RequestParam(required = false) @ApiParam(value = "鍗曢」鍚�") String proName) { LambdaQueryWrapper<TjProject> wq =new LambdaQueryWrapper<>(); wq.eq(TjProject::getProParentId,0); - if(null !=proName && !proName.equals("")){ + wq.eq(TjProject::getProStatus,0); + if(null !=proName && !proName.isEmpty()){ wq.like(TjProject::getProName,proName); } List<TjProject> tjProjectList = projectService.list(wq); diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java index dfdfb58..db7e2b4 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java @@ -232,6 +232,8 @@ private ISysDictDataService sysDictDataService; @Autowired private TjFlowingWaterHisService tjFlowingWaterHisService; + @Resource + private ITjXdPictureService xdPictureService; //灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡 public JSONObject getJSONObject(String builder) { @@ -1231,6 +1233,8 @@ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString()); + List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber()); + xdPictureService.saveBatch(xdPictureList); List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId()); addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null); } else { @@ -1342,6 +1346,8 @@ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString()); + List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber()); + xdPictureService.saveBatch(xdPictureList); List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId()); addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null); return AjaxResult.success(tjNumber); @@ -2696,6 +2702,8 @@ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString()); + List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber()); + xdPictureService.saveBatch(xdPictureList); } } if (tjFlowingWater.getPayStasus() == 1L) { @@ -2707,6 +2715,8 @@ tjFlowingWaterService.updateById(tjFlowingWater); remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString()); // asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser); + List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber()); + xdPictureService.saveBatch(xdPictureList); } } @@ -3069,7 +3079,7 @@ TjCustomer customer = tjCustomerService.getById(order.getUserId()); customer.setCardId("0"); tjCustomerService.updateById(customer); - + xdPictureService.deleteTjXdPictureBytjNum(tjNum); tjSamplingMapper.deleteByTjNumAndCusId(tjNum, order.getUserId()); } diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java index f117b58..a790422 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java @@ -11,14 +11,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ltkj.common.core.redis.RedisCache; import com.ltkj.framework.config.MatchUtils; -import com.ltkj.hosp.domain.TjCustomer; -import com.ltkj.hosp.domain.TjProject; -import com.ltkj.hosp.domain.TjSampling; -import com.ltkj.hosp.domain.TjXdPicture; -import com.ltkj.hosp.service.ITjCustomerService; -import com.ltkj.hosp.service.ITjProjectService; -import com.ltkj.hosp.service.ITjXdPictureService; -import com.ltkj.hosp.service.TjAsyncService; +import com.ltkj.hosp.domain.*; +import com.ltkj.hosp.service.*; import com.ltkj.system.service.ISysConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -49,6 +43,14 @@ private ITjCustomerService customerService; @Autowired private ISysConfigService configService; + @Resource + private ITjOrderService orderService; + @Resource + private ITjOrderDetailService detailService; + @Resource + private ITjOrderRemarkService remarkService; + @Resource + private ITjProjectService projectService; /** * 鏌ヨ浣撴蹇冪數鍥剧鐞嗗垪琛� @@ -74,7 +76,7 @@ wq.orderByDesc(TjXdPicture::getCreateTime); List<TjXdPicture> list = tjXdPictureService.list(wq); List<Map<String,Object>> arrayList=new ArrayList<>(); - if(null !=list && list.size()>0){ + if(null !=list && !list.isEmpty()){ Map<String, List<TjXdPicture>> stringListMap = list.stream().collect(Collectors.groupingBy(TjXdPicture::getCusId)); for (Map.Entry<String, List<TjXdPicture>> entry : stringListMap.entrySet()) { Map<String,Object>map=new HashMap<>(); @@ -91,7 +93,7 @@ } List<Map<String, Object>> collect =null; Map<String,Object>map=new HashMap<>(); - if(arrayList.size()>0){ + if(!arrayList.isEmpty()){ collect = arrayList.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); } map.put("list",collect); @@ -141,7 +143,37 @@ @PutMapping @ApiOperation(value = "淇敼浣撴蹇冪數鍥剧鐞�") public AjaxResult edit(@RequestBody TjXdPicture tjXdPicture) { - return toAjax(tjXdPictureService.updateTjXdPicture(tjXdPicture)); + if (tjXdPictureService.updateById(tjXdPicture)) { + TjOrder order = orderService.getOrderByTjNum(tjXdPicture.getTjNum()); + LambdaQueryWrapper<TjOrderDetail>wq=new LambdaQueryWrapper<>(); + wq.eq(TjOrderDetail::getOrderId,order.getOrderId()); + wq.eq(TjOrderDetail::getProId,tjXdPicture.getProId()); + TjOrderDetail detail = detailService.getOne(wq); + detail.setProResult(tjXdPicture.getProResult()); + detail.setConclusion(tjXdPicture.getConclusion()); + detail.setTjStatus(1L); + detailService.updateById(detail); + + TjProject tjProject = projectService.getById(tjXdPicture.getProId()); + TjProject tjProjectp = projectService.getById(tjProject.getProParentId()); + + LambdaQueryWrapper<TjOrderDetail>wq1=new LambdaQueryWrapper<>(); + wq1.eq(TjOrderDetail::getOrderId,order.getOrderId()); + wq1.eq(TjOrderDetail::getProId,tjProjectp.getProId()); + TjOrderDetail detailp = detailService.getOne(wq); + detailp.setTjStatus(1L); + detailService.updateById(detailp); + + LambdaQueryWrapper<TjOrderRemark> wq2=new LambdaQueryWrapper<>(); + wq2.eq(TjOrderRemark::getTjNumber,tjXdPicture.getTjNum()); + wq2.eq(TjOrderRemark::getProId,tjProjectp.getProId()); + TjOrderRemark remark = remarkService.getOne(wq2); + remark.setType(1); + remark.setRemark(tjXdPicture.getConclusion()); + remarkService.updateById(remark); + return AjaxResult.success(); + } + return AjaxResult.error(); } /** diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdPicture.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdPicture.java index 1fc61b9..4a4fffb 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdPicture.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjXdPicture.java @@ -85,88 +85,4 @@ @TableField(exist = false) private String picturePath; - - - public void setId(String id) { - this.id = id; - } - - public String getId() { - return id; - } - - public void setTjNum(String tjNum) { - this.tjNum = tjNum; - } - - public String getTjNum() { - return tjNum; - } - - public void setCusId(String cusId) { - this.cusId = cusId; - } - - public String getCusId() { - return cusId; - } - - public void setXdt(String xdt) { - this.xdt = xdt; - } - - public String getXdt() { - return xdt; - } - - public void setProId(String proId) { - this.proId = proId; - } - - public String getProId() { - return proId; - } - - public void setProName(String proName) { - this.proName = proName; - } - - public String getProName() { - return proName; - } - - public void setProResult(String proResult) { - this.proResult = proResult; - } - - public String getProResult() { - return proResult; - } - - public void setConclusion(String conclusion) { - this.conclusion = conclusion; - } - - public String getConclusion() { - return conclusion; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("tjNum", getTjNum()) - .append("cusId", getCusId()) - .append("xdt", getXdt()) - .append("proId", getProId()) - .append("proName", getProName()) - .append("proResult", getProResult()) - .append("conclusion", getConclusion()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("deleted", getDeleted()) - .toString(); - } } diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java index ea40099..b9f364b 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java @@ -108,6 +108,6 @@ @Select("SELECT a.id pac_id,grouping_name pac_name,a.ys_price price , GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) allProName FROM tj_dw_grouping a JOIN tj_grouping_pro b ON b.grouping_id=a.id \n" + - "WHERE a.deleted=0 and a.dw_id=#{dwId} AND a.sex=#{sex} GROUP BY b.grouping_id") + "WHERE a.deleted=0 and a.dw_id=#{dwId} AND (a.sex=#{sex} or a.sex=2) GROUP BY b.grouping_id") List<TjPackage> huoqutuantitaocanxiangmu(@Param("dwId") String dwId,@Param("sex") Long sex); } diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjGroupingProMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjGroupingProMapper.java index 55181b1..3150f15 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjGroupingProMapper.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjGroupingProMapper.java @@ -81,6 +81,14 @@ @Delete("DELETE FROM tj_grouping_pro WHERE grouping_id =#{groupingId}") void deletedTjGroupingProByGroupingId(String groupingId); + + + @Update(" update tj_grouping_pro " + + " SET " + + " limits=#{limits}," + + " ys_price=pro_price*(#{limits}/10)" + + " where grouping_id=#{groupId} ") + boolean updateGroupProLimitsByGroupId(@Param("groupId") String groupId,@Param("limits") String limits); // // @Insert("") // boolean saveTjOrderDetailsByGroupId(@Param("groupingId") String groupingId,@Param("userName") String userName,@Param("userId") String userId,@Param("orderId")String orderId); diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjXdPictureMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjXdPictureMapper.java index e292edb..aba62c4 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjXdPictureMapper.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjXdPictureMapper.java @@ -3,7 +3,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ltkj.common.core.domain.BaseEntity; import com.ltkj.hosp.domain.TjXdPicture; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -63,4 +66,25 @@ * @return 缁撴灉 */ public int deleteTjXdPictureByIds(String[] ids); + + @Select("SELECT\n" + + " b.tj_number tj_num,\n" + + " b.user_id cus_id,\n" + + " c.cus_name,\n" + + " a.pro_id ,\n" + + " d.pro_name,\n" + + " a.pro_result\n" + + "FROM\n" + + " tj_order_detail a\n" + + " JOIN tj_order b ON b.order_id = a.order_id\n" + + " JOIN tj_customer c ON c.cus_id = b.user_id\n" + + " JOIN tj_project d ON d.pro_id = a.pro_id\n" + + " JOIN sys_dept e ON e.dept_id = d.dept_id \n" + + "WHERE\n" + + " e.dept_id = '601' AND d.pro_parent_id !=0 AND b.tj_number=#{tjNum}") + List<TjXdPicture> saveTjXdPicture(String tjNum); + + + @Delete("delete from tj_xd_picture where tj_num= #{tjNum}") + void deleteTjXdPictureBytjNum(String tjNum); } diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjGroupingProService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjGroupingProService.java index cafce87..028b2c9 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjGroupingProService.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjGroupingProService.java @@ -66,5 +66,7 @@ void deletedTjGroupingProByGroupingId(String groupingId); + boolean updateGroupProLimitsByGroupId(String groupId, String limits); + // boolean saveTjOrderDetailsByGroupId(String groupingId,String userName, String userId,String orderId); } diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjXdPictureService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjXdPictureService.java index 72b6c08..14131fc 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjXdPictureService.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjXdPictureService.java @@ -61,4 +61,9 @@ * @return 缁撴灉 */ public int deleteTjXdPictureById(String id); + + + public List<TjXdPicture> saveTjXdPicture(String tjNum); + + void deleteTjXdPictureBytjNum(String tjNum); } diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjGroupingProServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjGroupingProServiceImpl.java index cb1cd9a..4cbaa83 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjGroupingProServiceImpl.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjGroupingProServiceImpl.java @@ -101,6 +101,11 @@ tjGroupingProMapper.deletedTjGroupingProByGroupingId(groupingId); } + @Override + public boolean updateGroupProLimitsByGroupId(String groupId, String limits) { + return tjGroupingProMapper.updateGroupProLimitsByGroupId(groupId,limits); + } + // @Override // public boolean saveTjOrderDetailsByGroupId(String groupingId, String userName, String userId,String orderId) { // return tjGroupingProMapper.saveTjOrderDetailsByGroupId(groupingId,userName,userId,orderId); diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjXdPictureServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjXdPictureServiceImpl.java index 5022a2d..d2fb179 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjXdPictureServiceImpl.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjXdPictureServiceImpl.java @@ -90,4 +90,14 @@ public int deleteTjXdPictureById(String id) { return tjXdPictureMapper.deleteTjXdPictureById(id); } + + @Override + public List<TjXdPicture> saveTjXdPicture(String tjNum) { + return tjXdPictureMapper.saveTjXdPicture(tjNum); + } + + @Override + public void deleteTjXdPictureBytjNum(String tjNum) { + tjXdPictureMapper.deleteTjXdPictureBytjNum(tjNum); + } } -- Gitblit v1.8.0