From 25dde05710b0a366a8f828fa45e39b7ec8e1d8e1 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Wed, 10 Sep 2025 09:03:06 +0800 Subject: [PATCH 1/9] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ims/OrderGoodsMapper.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsMapper.xml index 5d888a1..1ae19df 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsMapper.xml @@ -97,12 +97,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and iog.total_num ]]> iog.totalIntoNum - + and iog.request_arrival_time = ]]> #{startTime} - + and iog.request_arrival_time #{endTime} + + and iog.request_arrival_time = ]]> Date_format(#{startDateTime},'%Y-%m-%d') + + + and iog.request_arrival_time Date_format(#{endDateTime},'%Y-%m-%d') + and iog.order_goods_code in From 3ab59fae25f0bd7416f4e25dbe4ab8804fff6230 Mon Sep 17 00:00:00 2001 From: jiask <1069621233@qq.com> Date: Thu, 11 Sep 2025 15:14:14 +0800 Subject: [PATCH 2/9] JSK --- .../HealthPersonMedicalReportController.java | 9 +-- .../domain/HealthPersonMedicalReport.java | 3 +- .../HealthPersonMedicalReportMapper.java | 7 +-- .../IHealthPersonMedicalReportService.java | 3 +- .../HealthPersonMedicalReportServiceImpl.java | 15 +++-- .../service/impl/OrderGoodsServiceImpl.java | 15 ++--- .../HealthPersonMedicalReportMapper.xml | 58 ++++++++++++++++++- 7 files changed, 84 insertions(+), 26 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonMedicalReportController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonMedicalReportController.java index 32ff02a..5854bab 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonMedicalReportController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonMedicalReportController.java @@ -3,9 +3,7 @@ package com.bonus.canteen.core.health.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.bonus.canteen.core.health.domain.HealthChronic; -import com.bonus.canteen.core.health.domain.HealthMedicalReportDetails; -import com.bonus.canteen.core.health.domain.HealthPersonMedicalReportDetails; +import com.bonus.canteen.core.health.domain.*; import com.bonus.common.log.enums.OperaType; //import com.bonus.canteen.core.health.common.annotation.PreventRepeatSubmit; import io.swagger.annotations.Api; @@ -21,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.security.annotation.RequiresPermissions; -import com.bonus.canteen.core.health.domain.HealthPersonMedicalReport; import com.bonus.canteen.core.health.service.IHealthPersonMedicalReportService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; @@ -47,9 +44,9 @@ public class HealthPersonMedicalReportController extends BaseController { @ApiOperation(value = "查询人员体检报告列表") //@RequiresPermissions("health:report:list") @GetMapping("/list") - public TableDataInfo list(HealthPersonMedicalReport healthPersonMedicalReport) { + public TableDataInfo list(HealthPersonInfo healthPersonMedicalReport) { startPage(); - List list = healthPersonMedicalReportService.selectHealthPersonMedicalReportList(healthPersonMedicalReport); + List list = healthPersonMedicalReportService.selectHealthPersonMedicalReportList2(healthPersonMedicalReport); return getDataTable(list); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonMedicalReport.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonMedicalReport.java index 4a69f5f..9b914da 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonMedicalReport.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonMedicalReport.java @@ -49,6 +49,7 @@ public class HealthPersonMedicalReport extends BaseEntity { @Excel(name = "体检模板id") @ApiModelProperty(value = "体检模板id") private Long medicalTemplateId; - + private String encryptedSearchValue; + private String articleTitle; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/mapper/HealthPersonMedicalReportMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/mapper/HealthPersonMedicalReportMapper.java index e536432..5091b22 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/mapper/HealthPersonMedicalReportMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/mapper/HealthPersonMedicalReportMapper.java @@ -2,10 +2,7 @@ package com.bonus.canteen.core.health.mapper; import java.util.List; -import com.bonus.canteen.core.health.domain.HealthMedicalReportDetail; -import com.bonus.canteen.core.health.domain.HealthMedicalReportDetails; -import com.bonus.canteen.core.health.domain.HealthPersonMedicalReport; -import com.bonus.canteen.core.health.domain.HealthPersonMedicalReportDetails; +import com.bonus.canteen.core.health.domain.*; import org.apache.ibatis.annotations.Param; /** @@ -30,7 +27,7 @@ public interface HealthPersonMedicalReportMapper { * @return 人员体检报告集合 */ public List selectHealthPersonMedicalReportList(HealthPersonMedicalReport healthPersonMedicalReport); - + public List selectHealthPersonMedicalReportList2(HealthPersonInfo healthPersonMedicalReport); /** * 新增人员体检报告 * diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/IHealthPersonMedicalReportService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/IHealthPersonMedicalReportService.java index 0733a09..5cdd69c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/IHealthPersonMedicalReportService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/IHealthPersonMedicalReportService.java @@ -3,6 +3,7 @@ package com.bonus.canteen.core.health.service; import java.util.List; import com.bonus.canteen.core.health.domain.HealthMedicalReportDetails; +import com.bonus.canteen.core.health.domain.HealthPersonInfo; import com.bonus.canteen.core.health.domain.HealthPersonMedicalReport; import com.bonus.canteen.core.health.domain.HealthPersonMedicalReportDetails; @@ -29,7 +30,7 @@ public interface IHealthPersonMedicalReportService { */ public List selectHealthPersonMedicalReportList(HealthPersonMedicalReport healthPersonMedicalReport); - + public List selectHealthPersonMedicalReportList2(HealthPersonInfo healthPersonMedicalReport); /** * 新增人员体检报告 * diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonMedicalReportServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonMedicalReportServiceImpl.java index 93f749f..bc07d4b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonMedicalReportServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonMedicalReportServiceImpl.java @@ -3,15 +3,13 @@ package com.bonus.canteen.core.health.service.impl; import java.util.ArrayList; import java.util.List; -import com.bonus.canteen.core.health.domain.HealthMedicalReportDetail; -import com.bonus.canteen.core.health.domain.HealthMedicalReportDetails; -import com.bonus.canteen.core.health.domain.HealthPersonMedicalReportDetails; +import com.bonus.canteen.core.health.domain.*; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.houqin.utils.SM4EncryptUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.canteen.core.health.mapper.HealthPersonMedicalReportMapper; -import com.bonus.canteen.core.health.domain.HealthPersonMedicalReport; import com.bonus.canteen.core.health.service.IHealthPersonMedicalReportService; /** @@ -44,9 +42,16 @@ public class HealthPersonMedicalReportServiceImpl implements IHealthPersonMedica */ @Override public List selectHealthPersonMedicalReportList(HealthPersonMedicalReport healthPersonMedicalReport) { + String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(healthPersonMedicalReport.getArticleTitle()); + healthPersonMedicalReport.setEncryptedSearchValue(encryptedSearchValue); return healthPersonMedicalReportMapper.selectHealthPersonMedicalReportList(healthPersonMedicalReport); } - + @Override + public List selectHealthPersonMedicalReportList2(HealthPersonInfo healthPersonMedicalReport) { + String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(healthPersonMedicalReport.getArticleTitle()); + healthPersonMedicalReport.setEncryptedSearchValue(encryptedSearchValue); + return healthPersonMedicalReportMapper.selectHealthPersonMedicalReportList2(healthPersonMedicalReport); + } /** * 新增人员体检报告 * diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsServiceImpl.java index 1cb5ef7..cac4fd5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsServiceImpl.java @@ -203,13 +203,14 @@ public class OrderGoodsServiceImpl implements IOrderGoodsService { } } } - InspectGoodsSum inspectGoodsSum = inspectGoodsService - .getInspectGoodsListByOrderGoodsCode(orderGoodsVO.getOrderGoodsCode()); - if(Objects.nonNull(inspectGoodsSum) && Objects.nonNull(inspectGoodsSum.getTotalQualifiedNum())) { - orderGoodsVO.setTotalQualifiedNum(inspectGoodsSum.getTotalQualifiedNum()); - }else{ - orderGoodsVO.setTotalQualifiedNum(BigDecimal.ZERO); - } + + } + InspectGoodsSum inspectGoodsSum = inspectGoodsService + .getInspectGoodsListByOrderGoodsCode(orderGoodsVO.getOrderGoodsCode()); + if(Objects.nonNull(inspectGoodsSum) && Objects.nonNull(inspectGoodsSum.getTotalQualifiedNum())) { + orderGoodsVO.setTotalQualifiedNum(inspectGoodsSum.getTotalQualifiedNum()); + }else{ + orderGoodsVO.setTotalQualifiedNum(BigDecimal.ZERO); } } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonMedicalReportMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonMedicalReportMapper.xml index 3b2a956..fc23000 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonMedicalReportMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonMedicalReportMapper.xml @@ -15,6 +15,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + + + + + + select id, medical_id, user_id, medical_date, medical_mechanism, medical_template_id, create_by, create_time, update_by, update_time from health_person_medical_report @@ -31,7 +55,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc - + @@ -20,4 +21,33 @@ values (#{dto.userId},#{dto.machineId},#{dto.sex},#{dto.age},#{dto.height},#{dto.weight},#{dto.bmi},#{dto.bodyFat},#{dto.muscle},#{dto.boneMass},#{dto.waterContent},#{dto.extwater},#{dto.protein} ,#{dto.metabolism},#{dto.fatLevel},#{dto.bodyAge}) + + + + + + \ No newline at end of file diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsMapper.xml index 1ae19df..ea0f781 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsMapper.xml @@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -51,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" iog.create_time, iog.update_by, iog.update_time, isr.supplier_name, iwi.warehouse_name, ba.area_name, bc.canteen_name, bs.stall_name, contract_code, iogps.pay_money_date, iogps.pay_money_style, iogps.collect_money_account, iogps.collect_money_account_name, - iogps.collect_money_bank, iog.supplier_id, iog.warehouse_id + iogps.collect_money_bank, iog.supplier_id, iog.warehouse_id,IFNULL(iig.delivery_total_num,0) as total_qualified_num from ims_order_goods iog left join ims_order_goods_pay_style iogps on iogps.order_goods_id = iog.order_goods_code left join ims_supplier isr on isr.supplier_id = iog.supplier_id @@ -59,19 +60,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join basic_area ba on ba.area_id = iog.area_id left join basic_canteen bc on bc.canteen_id = iog.canteen_id left join basic_stall bs on bs.stall_id = iog.stall_id + left join( + SELECT + relate_order_goods_id,status,sum(delivery_total_num) as delivery_total_num + from + ims_inspect_goods where `status` = 2 + GROUP BY relate_order_goods_id + )iig on iig.relate_order_goods_id = iog.order_goods_code select recipe_detail_id from cook_recipe_detail where apply_date = ]]> #{applyDate} and detail_type = '2' + + + ${sqld} + + diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsIntoInventoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsIntoInventoryMapper.xml index e1438a3..f4edba7 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsIntoInventoryMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsIntoInventoryMapper.xml @@ -375,4 +375,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND inventory_num >= #{fetchNum} AND del_flag = '0' + + From 08e38c44d32d2c682e9eee1aba2eb8de16301a2d Mon Sep 17 00:00:00 2001 From: jiask <1069621233@qq.com> Date: Fri, 12 Sep 2025 14:54:11 +0800 Subject: [PATCH 7/9] jsk --- .../core/ims/vo/FetchMaterialPageVO.java | 19 +++++++++---------- .../mapper/ims/FetchMaterialMapper.xml | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/FetchMaterialPageVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/FetchMaterialPageVO.java index efc4f0d..b7474d0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/FetchMaterialPageVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/FetchMaterialPageVO.java @@ -47,7 +47,7 @@ public class FetchMaterialPageVO { @ApiModelProperty("领料人id") private Long fetchUserId; @ApiModelProperty("领料人") - private String fetchUserName; + private String fetchUser; @ApiModelProperty("审批状态(1待审核,2审批中,3审批通过,4审批不通过)") private Integer approveStatus; @ApiModelProperty("审批流程id") @@ -133,10 +133,6 @@ public class FetchMaterialPageVO { return this.fetchUserId; } - public String getFetchUserName() { - return this.fetchUserName; - } - public Integer getApproveStatus() { return this.approveStatus; } @@ -267,11 +263,6 @@ public class FetchMaterialPageVO { return this; } - public FetchMaterialPageVO setFetchUserName(final String fetchUserName) { - this.fetchUserName = fetchUserName; - return this; - } - public FetchMaterialPageVO setApproveStatus(final Integer approveStatus) { this.approveStatus = approveStatus; return this; @@ -321,4 +312,12 @@ public class FetchMaterialPageVO { this.curUserApprove = curUserApprove; return this; } + + public String getFetchUser() { + return fetchUser; + } + + public void setFetchUser(String fetchUser) { + this.fetchUser = fetchUser; + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/FetchMaterialMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/FetchMaterialMapper.xml index 92d88f5..781ddb4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/FetchMaterialMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/FetchMaterialMapper.xml @@ -161,7 +161,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dw.warehouse_name, a.fetch_material_time, a.fetch_user_id, - su.user_name AS fetch_user_name, + a.fetch_user AS fetchUser, a.approve_status, a.process_instance_id, a.fetch_user, From 36d719a0ce42db1a3ff03f17b3f6439797c72b55 Mon Sep 17 00:00:00 2001 From: jiask <1069621233@qq.com> Date: Fri, 12 Sep 2025 15:31:11 +0800 Subject: [PATCH 8/9] jsk --- .../src/main/resources/mapper/cook/CookRecipeH5Mapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeH5Mapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeH5Mapper.xml index 207c3a3..d17d5b8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeH5Mapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeH5Mapper.xml @@ -175,9 +175,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mdsr.sale_month = month(curdate()) left join basic_canteen ac on mr.canteen_id = ac.canteen_id left join basic_stall ass on mr.stall_id = ass.stall_id + left join basic_stall_mealtime bsm on mr.stall_id=bsm.stall_id and mrd.mealtime_type=bsm.mealtime_type where mrd.apply_date = #{applyDate} - and mr.recipe_id = #{recipeId} + and mr.recipe_id = #{recipeId} and bsm.if_enable='1' order by md.dishes_id asc From 786fe982aa219ad6e552408ad80969f4d22fffb3 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Fri, 12 Sep 2025 17:55:18 +0800 Subject: [PATCH 9/9] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ims/ImsOutInventoryMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsOutInventoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsOutInventoryMapper.xml index 575f92d..ce481c5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsOutInventoryMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsOutInventoryMapper.xml @@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select out_id, out_code, ioi.warehouse_id, out_date, ioi.fetch_user_id, total_num, out_type, ioi.status, order_id, total_amount, plan_id, fetch_material_id, goods_allocation_id, ioi.remark, ioi.del_flag, ioi.create_by, ioi.create_time, ioi.update_by, ioi.update_time, - iwi.warehouse_name, ioi.fetch_user, ba.area_id, ba.area_name + iwi.warehouse_name, ifnull(ioi.fetch_user,su.nick_name)as fetch_user, ba.area_id, ba.area_name from ims_out_inventory ioi left join ims_warehouse_info iwi on ioi.warehouse_id = iwi.warehouse_id left join basic_area ba on iwi.area_id = ba.area_id