From 101f08b62094864ce6cc4931051b835300239390 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Sun, 15 Mar 2026 13:59:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BE=E6=89=8B=E5=85=8D=E8=B4=A3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E7=94=9F=E4=BA=A7=E6=A0=87=E8=AF=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/LauncherConstant.java | 2 +- .../quality/pojo/entity/RaiseHandRecord.java | 57 ++++++ .../quality/pojo/vo/RaiseHandRecordVO.java | 24 +++ .../desk/quality/pojo/vo/RaiseHandVO.java | 18 ++ .../scheduling/feign/IWorkOrderClient.java | 7 + .../feign/IWorkOrderClientFallback.java | 7 + .../basic/controller/ProdMarkController.java | 23 ++- .../desk/basic/mapper/ProdMarkMapper.java | 2 +- .../desk/basic/mapper/ProdMarkMapper.xml | 4 + .../desk/basic/service/IProdMarkService.java | 2 +- .../service/impl/ProdMarkServiceImpl.java | 5 + .../controller/IotHardnessController.java | 1 + .../controller/IotThicknessController.java | 6 +- .../controller/RaiseHandController.java | 182 +++++++++++++++++- .../desk/quality/mapper/RaiseHandMapper.java | 2 +- .../desk/quality/mapper/RaiseHandMapper.xml | 57 +++++- .../quality/mapper/RaiseHandMapperRecord.xml | 40 ++++ .../quality/mapper/RaiseHandRecordMapper.java | 37 ++++ .../service/IRaiseHandRecordService.java | 34 ++++ .../quality/service/IRaiseHandService.java | 1 + .../impl/InspectionTaskServiceImpl.java | 24 ++- .../impl/RaiseHandRecordServiceImpl.java | 59 ++++++ .../service/impl/RaiseHandServiceImpl.java | 5 + .../service/impl/ReviewSheetServiceImpl.java | 1 + .../wrapper/RaiseHandRecordWrapper.java | 32 +++ .../scheduling/feign/WorkOrderClient.java | 7 + 26 files changed, 619 insertions(+), 20 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHandRecord.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RaiseHandRecordVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RaiseHandMapperRecord.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RaiseHandRecordMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IRaiseHandRecordService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/RaiseHandRecordServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/RaiseHandRecordWrapper.java diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index be4404d7..ff949667 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -31,7 +31,7 @@ public interface LauncherConstant { /** * nacos dev 地址 */ - String NACOS_DEV_ADDR = "192.168.249.27:8848"; + String NACOS_DEV_ADDR = "127.0.0.1:8848"; // String NACOS_DEV_ADDR = "127.0.0.1:8848"; /** diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHandRecord.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHandRecord.java new file mode 100644 index 00000000..b295238e --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHandRecord.java @@ -0,0 +1,57 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; + + +@TableName("QA_WORK_RAISE_HAND_RECORD") +@Data +@EqualsAndHashCode(callSuper = true) +@Schema(description = "RaiseRecord Entity对象") +public class RaiseHandRecord extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + + /** + * 举手免责id + */ + @Schema(description = "举手免责id") + private Long handId; + /** + * 审批人Id + */ + @Schema(description = "审批人Id") + private Long reviewUserId; + private String reviewUserName; + /** + * 当前节点 + */ + @Schema(description = "当前节点") + private Integer currentStatus; + /** + * 是否同意 + */ + @Schema(description = "是否同意 1:同意 0：不同意") + private String isSuccess; + /** + * 审批内容 + */ + @Schema(description = "审批内容") + private String notes; + + @TableField(exist = false) + @Schema(description = "节点名称") + private String pointName; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RaiseHandRecordVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RaiseHandRecordVO.java new file mode 100644 index 00000000..bb2b7482 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RaiseHandRecordVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.RaiseHand; + +import java.io.Serial; + +/** + * [工序检验项明细] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class RaiseHandRecordVO extends RaiseHand { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RaiseHandVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RaiseHandVO.java index ad419f71..42ab5d03 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RaiseHandVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RaiseHandVO.java @@ -3,12 +3,16 @@ */ package org.springblade.desk.quality.pojo.vo; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.RaiseHand; +import org.springblade.desk.quality.pojo.entity.RaiseHandRecord; import org.springblade.desk.quality.pojo.entity.WorkPlanThicknessDetail; import java.io.Serial; +import java.util.ArrayList; +import java.util.List; /** * [工序检验项明细] 视图实体类 @@ -22,4 +26,18 @@ public class RaiseHandVO extends RaiseHand { @Serial private static final long serialVersionUID = 1L; + private List ids; + + private String checkStatus; + + private String notes; + + /** + * 是否同意 + */ + @Schema(description = "是否同意 1:同意 0：不同意") + private String isSuccess; + + private List all = new ArrayList<>(); + } diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java index 5a4b6ce7..61a77701 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java @@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import java.util.List; + /** * TODO：功能描述 * @@ -35,6 +37,8 @@ public interface IWorkOrderClient { String GLASS_CAKE_QUALITY = API_PREFIX + "/getById"; String GLASS_CAKE_QUALITY_NAME = API_PREFIX + "/getByName"; + String GLASS_CAKE_QUALITY_List = API_PREFIX + "/getList"; + /** * 排产 @@ -53,4 +57,7 @@ public interface IWorkOrderClient { @PostMapping(GLASS_CAKE_QUALITY_NAME) R getByName(@RequestBody String name); + @GetMapping(GLASS_CAKE_QUALITY_List) + List getList(); + } diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java index 1dda1bee..87fac541 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java @@ -33,6 +33,8 @@ import org.springblade.scheduling.pojo.vo.GlassCakeOrderPageQuery; import org.springblade.scheduling.pojo.vo.WorkOrderVO; import org.springframework.stereotype.Component; +import java.util.List; + /** * Feign失败配置 * @@ -65,4 +67,9 @@ public class IWorkOrderClientFallback implements IWorkOrderClient { public R getByName(String name) { return null; } + + @Override + public List getList() { + return null; + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java index bd94226e..f4750d5e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java @@ -34,6 +34,8 @@ import org.springblade.desk.basic.pojo.vo.ProdMarkVO; import org.springblade.desk.basic.service.IProdMarkService; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.basic.wrapper.ProdMarkWrapper; +import org.springblade.scheduling.feign.IWorkOrderClient; +import org.springblade.scheduling.pojo.entity.QualityGradeEntity; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -61,6 +63,8 @@ public class ProdMarkController extends BladeController { @Resource private IProdMarkService service; + @Resource + private IWorkOrderClient iWorkOrderClient; /** * [生产标识] 详情 @@ -117,10 +121,23 @@ public class ProdMarkController extends BladeController { @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) @Operation(summary = "list下拉选择", description = "") +// public R> listForSelect() { public R> listForSelect() { - List list = service.list(); - List listVO = ProdMarkWrapper.build().listVO(list); - return R.data(listVO); +// List list = service.list(); +// List listVO = ProdMarkWrapper.build().listVO(list); +// return R.data(listVO); +// List vos = new ArrayList<>(); +// List list = iWorkOrderClient.getList(); +// for(QualityGradeEntity entity : list){ +// ProdMarkVO vo = new ProdMarkVO(); +// vo.setId(entity.getId()); +// vo.setName(entity.getQualityGrade()); +// vos.add( vo); +// } + + List vos = service.getList(); + + return R.data(vos); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ProdMarkMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ProdMarkMapper.java index 59d35f33..3cde0692 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ProdMarkMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ProdMarkMapper.java @@ -29,7 +29,7 @@ public interface ProdMarkMapper extends BaseMapper { * @return List */ List selectProdMarkPage(IPage page, ProdMarkVO prodMark); - + public List getList(); /** * 获取导出数据 * diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ProdMarkMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ProdMarkMapper.xml index e5e71a76..0b7c8e1f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ProdMarkMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ProdMarkMapper.xml @@ -18,6 +18,10 @@ SELECT * FROM BA_PROD_MARK WHERE is_deleted = 0 + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IProdMarkService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IProdMarkService.java index 0f3134cd..c6bbd292 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IProdMarkService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IProdMarkService.java @@ -27,7 +27,7 @@ public interface IProdMarkService extends BaseService { * @return IPage */ IPage selectProdMarkPage(IPage page, ProdMarkVO prodMark); - + List getList(); /** * 导出数据 * diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ProdMarkServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ProdMarkServiceImpl.java index d5c8c8a3..91a95433 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ProdMarkServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ProdMarkServiceImpl.java @@ -42,6 +42,11 @@ public class ProdMarkServiceImpl extends BaseServiceImpl getList() { + return baseMapper.getList(); + } + @Override public List exportProdMark(Wrapper queryWrapper) { List prodMarkList = baseMapper.exportProdMark(queryWrapper); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java index cc8ccb9c..e59107bd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java @@ -130,6 +130,7 @@ public class IotHardnessController extends BladeController { // 修改服务层方法，使其根据设备编码和未读状态查询 QueryWrapper qwhard = new QueryWrapper<>(); +// qwhard.eq("EQUIPMENT_ID",123); qwhard.eq("EQUIPMENT_ID",card.getId()); qwhard.eq("FLAG_READ",0); qwhard.orderByDesc("CREATE_TIME"); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java index a8afc716..534dad66 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java @@ -19,6 +19,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.boot.file.BladeFileUtil; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -118,7 +119,7 @@ public class IotThicknessController extends BladeController { } - @GetMapping(value = "/queryChyData") + @PostMapping(value = "/queryChyData") public R queryChyData(@RequestBody JSONObject data) throws Exception { InetAddress inetAddress = InetAddress.getLocalHost(); String ip = inetAddress.getHostAddress(); @@ -142,6 +143,7 @@ public class IotThicknessController extends BladeController { if (allData) { // sb.append(" and not_use = 0"); QueryWrapper qwhard = new QueryWrapper<>(); +// qwhard.eq("EQUIPMENT_CODE","LG020029"); qwhard.eq("EQUIPMENT_CODE",card.getDeviceCode()); qwhard.eq("FLAG_READ",0); if(startTime != null && endTime != null){ @@ -152,7 +154,9 @@ public class IotThicknessController extends BladeController { }else { // sb.append(" and not_use = 1"); + QueryWrapper qwhard = new QueryWrapper<>(); +// qwhard.eq("EQUIPMENT_CODE","LG020029"); qwhard.eq("EQUIPMENT_CODE",card.getDeviceCode()); qwhard.eq("FLAG_READ",1); if(startTime != null && endTime != null){ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RaiseHandController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RaiseHandController.java index 63025831..e8d58261 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RaiseHandController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RaiseHandController.java @@ -3,6 +3,7 @@ */ package org.springblade.desk.quality.controller; +import ch.qos.logback.core.joran.util.beans.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -24,6 +25,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.annotation.PreAuth; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; @@ -38,17 +40,16 @@ import org.springblade.desk.quality.pojo.entity.*; import org.springblade.desk.quality.pojo.vo.LiquidTankTaskCopyVO; import org.springblade.desk.quality.pojo.vo.LiquidTankWaveVO; import org.springblade.desk.quality.pojo.vo.RaiseHandVO; -import org.springblade.desk.quality.service.ILiquidTankTaskCopyService; -import org.springblade.desk.quality.service.ILiquidTankWaveService; -import org.springblade.desk.quality.service.IRaiseHandService; -import org.springblade.desk.quality.service.IRelTankWaveItemService; +import org.springblade.desk.quality.service.*; import org.springblade.desk.quality.util.FullMergeExcelUtil; import org.springblade.desk.quality.wrapper.LiquidTankTaskCopyWrapper; import org.springblade.desk.quality.wrapper.LiquidTankWaveWrapper; import org.springblade.desk.quality.wrapper.RaiseHandWrapper; import org.springblade.system.feign.IUserClient; import org.springblade.system.pojo.entity.User; +import org.springframework.beans.BeanUtils; import org.springframework.http.ResponseEntity; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -82,7 +83,8 @@ public class RaiseHandController extends BladeController { private IRelTankWaveItemService relReportItemService; @Resource private IUserClient userClient; - + @Resource + IRaiseHandRecordService recordService; /** @@ -96,6 +98,75 @@ public class RaiseHandController extends BladeController { RaiseHand detail = service.getOne(qw); RaiseHandVO detailVO = RaiseHandWrapper.build().entityVO(detail); + List all = new ArrayList<>(); + + QueryWrapper qwRecord = new QueryWrapper<>(); + qwRecord.eq("HAND_ID", detail.getId()); + qwRecord.eq("CURRENT_STATUS", 0); + qwRecord.orderByDesc("CREATE_TIME"); + + List record01s = recordService.list(qwRecord); + if(null != record01s && record01s.size() > 0){ + RaiseHandRecord record01 = record01s.get(0); + record01.setPointName("提交人"); + all.add(record01); + }else{ + RaiseHandRecord record01 = new RaiseHandRecord(); + record01.setPointName("提交人"); + all.add(record01); + } + + QueryWrapper qwRecord1 = new QueryWrapper<>(); + qwRecord1.eq("HAND_ID", detail.getId()); + qwRecord1.eq("CURRENT_STATUS", 1); + + qwRecord1.orderByDesc("CREATE_TIME"); + + List record1s = recordService.list(qwRecord1); + if(null != record1s && record1s.size() > 0){ + RaiseHandRecord record01 = record1s.get(0); + record01.setPointName("工艺管理员"); + all.add(record01); + }else{ + RaiseHandRecord record01 = new RaiseHandRecord(); + record01.setPointName("工艺管理员"); + all.add(record01); + } + + QueryWrapper qwRecord2 = new QueryWrapper<>(); + qwRecord2.eq("HAND_ID", detail.getId()); + qwRecord2.eq("CURRENT_STATUS", 2); + qwRecord2.orderByDesc("CREATE_TIME"); + + List record2s = recordService.list(qwRecord2); + if(null != record2s && record2s.size() > 0){ + RaiseHandRecord record01 = record2s.get(0); + record01.setPointName("质量管理员"); + all.add(record01); + }else{ + RaiseHandRecord record01 = new RaiseHandRecord(); + record01.setPointName("质量管理员"); + all.add(record01); + } + + QueryWrapper qwRecord3 = new QueryWrapper<>(); + qwRecord3.eq("HAND_ID", detail.getId()); + qwRecord3.eq("CURRENT_STATUS", 3); + qwRecord3.orderByDesc("CREATE_TIME"); + + List record3s = recordService.list(qwRecord3); + if(null != record3s && record3s.size() > 0){ + RaiseHandRecord record01 = record3s.get(0); + record01.setPointName("主管业务领导"); + all.add(record01); + }else{ + RaiseHandRecord record01 = new RaiseHandRecord(); + record01.setPointName("主管业务领导"); + all.add(record01); + } + + detailVO.setAll( all); + return R.data(detailVO); } @@ -107,6 +178,8 @@ public class RaiseHandController extends BladeController { @Operation(summary = "list分页", description = "传入LiquidTankWave Obj") public R> list(@Parameter(hidden = true) @RequestParam Map liquidTankWave, Query query) { + + QueryWrapper qw = Condition.getQueryWrapper(liquidTankWave, RaiseHand.class); qw.eq(liquidTankWave.containsKey("name"), LiquidTankReport.COL_NAME, liquidTankWave.get("name")); if (liquidTankWave.containsKey(BaseRequest.CREATE_TIME_START) && liquidTankWave.containsKey(BaseRequest.CREATE_TIME_END)) { @@ -114,6 +187,7 @@ public class RaiseHandController extends BladeController { Date crEnd = RequestUtil.buildDateEndOfDay(liquidTankWave, BaseRequest.CREATE_TIME_END); qw.between(BaseCol.CREATE_TIME, crStart, crEnd); } + IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = RaiseHandWrapper.build().pageVO(pages); return R.data(pagesVO); @@ -127,6 +201,41 @@ public class RaiseHandController extends BladeController { @ApiOperationSupport(order = 21) @Operation(summary = "page分页", description = "传入LiquidTankWave Obj") public R> page(RaiseHandVO liquidTankWave, Query query) { + + BladeUser user = AuthUtil.getUser(); + QueryWrapper qwhand = new QueryWrapper<>(); + qwhand.eq("REPORT_USER_ID", user.getUserId()); + qwhand.eq("STATUS",0); + List hands = service.list(qwhand); + List ids = new ArrayList<>(); + if(null != hands && hands.size() > 0){ + ids = hands.stream().map(RaiseHand::getId).collect(Collectors.toList()); + } + + liquidTankWave.setIds(ids); + + if(user.getRoleId().equals("2028359258054373378") || user.getNickName().equals("admin")){ + liquidTankWave.setCheckStatus(null); + }else{ + //工艺人员 + if("2000409951566053378".equals(user.getRoleId()) || "2019987303479734273".equals(user.getRoleId()) + || "1993624442365915137".equals(user.getRoleId())){ + liquidTankWave.setCheckStatus("1"); + } + //质量工程师 + else if("2003293549151420418".equals(user.getRoleId())){ + liquidTankWave.setCheckStatus("2"); + } + //主管业务领导 + else if("1123598816738675204".equals(user.getRoleId())){ + liquidTankWave.setCheckStatus("3"); + }else{ + liquidTankWave.setCheckStatus("0"); + } + } + + + IPage pagesVO = service.selectRaiseHandPage( Condition.getPage(query), liquidTankWave ); @@ -135,12 +244,57 @@ public class RaiseHandController extends BladeController { + + @PostMapping("/reviewData") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入LiquidTankWave Obj") + @Transactional + public R reviewData(@Valid @RequestBody RaiseHandVO addOne) { + RaiseHand one = service.getById(addOne.getId()); + Integer status = one.getStatus(); +// BeanUtils.copyProperties(addOne, one); + if("0".equals(addOne.getIsSuccess())){ + one.setStatus(0); + }else{ + one.setStatus(one.getStatus()+1); + } + service.updateById(one); + + RaiseHandRecord record = new RaiseHandRecord(); + record.setHandId(one.getId()); + record.setNotes(addOne.getNotes()); + record.setIsSuccess(addOne.getIsSuccess()); + record.setCurrentStatus(status); + record.setCreateTime(new Date()); + record.setReviewUserId(AuthUtil.getUser().getUserId()); + record.setReviewUserName(AuthUtil.getUser().getNickName()); + recordService.save(record); + return R.status(true); + } + + @PostMapping("/save") @ApiOperationSupport(order = 30) @Operation(summary = "新增一条", description = "传入LiquidTankWave Obj") + @Transactional public R save(@Valid @RequestBody RaiseHand addOne) { + addOne.setId(null); - return R.status(service.save(addOne)); + service.save(addOne); + if(1 == addOne.getStatus()){ + RaiseHandRecord record = new RaiseHandRecord(); + record.setHandId(addOne.getId()); + record.setNotes(""); + record.setIsSuccess("1"); + record.setCurrentStatus(0); + record.setCreateTime(new Date()); + record.setReviewUserId(AuthUtil.getUser().getUserId()); + record.setReviewUserName(AuthUtil.getUser().getNickName()); + recordService.save(record); + } + + + return R.status(true); } @PostMapping("/saveBat") @@ -157,7 +311,23 @@ public class RaiseHandController extends BladeController { @PostMapping("/update") @ApiOperationSupport(order = 40) @Operation(summary = "修改一条", description = "传入LiquidTankWave Obj") + @Transactional public R update(@Valid @RequestBody RaiseHand updateOne) { + + + if(1 == updateOne.getStatus()){ + RaiseHandRecord record = new RaiseHandRecord(); + record.setHandId(updateOne.getId()); + record.setNotes(""); + record.setIsSuccess("1"); + record.setCurrentStatus(0); + record.setCreateTime(new Date()); + record.setReviewUserId(AuthUtil.getUser().getUserId()); + record.setReviewUserName(AuthUtil.getUser().getNickName()); + recordService.save(record); + } + + return R.status(service.updateById(updateOne)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RaiseHandMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RaiseHandMapper.java index 7da3f863..0eb13101 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RaiseHandMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RaiseHandMapper.java @@ -32,7 +32,7 @@ public interface RaiseHandMapper extends BaseMapper { * @param workPlanItem 查询参数 * @return List */ - IPage selectRaiseHandPage(IPage page, RaiseHandVO workPlanItem); + IPage selectRaiseHandPage(IPage page, @Param("query") RaiseHandVO workPlanItem); List exportRaiseHand(@Param("ew") Wrapper queryWrapper); /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RaiseHandMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RaiseHandMapper.xml index fc275d8f..2970319e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RaiseHandMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RaiseHandMapper.xml @@ -28,8 +28,63 @@