suojin
/
jonhon-mes-svr
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

质量管理槽液管理有效期排查，槽液任务处理查询重构

Browse Source
liweidong
pangyang 1 month ago
parent 2e0ae8833a
commit 3f43215377
7 changed files with 88 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java
  2. 77
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java
  3. 8
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java
  4. 1
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.java
  5. 20
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml
  6. 1
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java
  7. 9
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java

5
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java
Unescape View File

@ -65,8 +65,8 @@ public class LiquidTankTaskCopyVO extends LiquidTankTaskCopy {
private LocalDate sampleDate;
@Schema(description = "化验频率(报告)")
private String testFrequency;
@Schema(description = "有效期")
private LocalDate validDate;
// @Schema(description = "有效期")
// private LocalDate validDate;
@Schema(description = "超出规范极限调整后的结果(报告)")
private String outRangeResult;
@Schema(description = "槽液清理记录(报告)")
@ -79,4 +79,5 @@ public class LiquidTankTaskCopyVO extends LiquidTankTaskCopy {
private String drugAddUserSign;
@Schema(description = "控制规范(报告)")
private String norm;
}

77
blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java
Unescape View File

@ -187,43 +187,62 @@ public class LiquidTankTaskController extends BladeController {
@GetMapping("/listHandle")
@ApiOperationSupport(order = 23)
@Operation(summary = "list任务处理分页", description = "传入LiquidTankTask Obj")
public R<IPage<LiquidTankTaskVO>> listHandle(@Parameter(hidden = true) @RequestParam Map<String, Object> liquidTankTask,
Query query) {
QueryWrapper<LiquidTankTask> qw = Condition.getQueryWrapper(liquidTankTask, LiquidTankTask.class);
qw.ne(BaseCol.STATUS, LiquidTankTaskConst.S_NOT_READY);
IPage<LiquidTankTask> pages = service.page(Condition.getPage(query), qw);
IPage<LiquidTankTaskVO> pagesVO = LiquidTankTaskWrapper.build().pageVO(pages);
List<LiquidTankTaskVO> list = pagesVO.getRecords();
for(LiquidTankTaskVO one : list){
LiquidTank tank = taskService.getById(one.getLiquidTankId());
Formula detail = formualaService.getById(tank.getAddDrugFormulaId());
if(null != detail){
one.setAddFormulaContent(detail.getContent());
}
Formula detailAfter = formualaService.getById(tank.getAfterTheoryFormulaId());
public R<IPage<LiquidTankTaskVO>> listHandle(LiquidTankTaskVO liquidTankTask, Query query) {
// public R<IPage<LiquidTankTaskVO>> listHandle(@Parameter(hidden = true) @RequestParam Map<String, Object> liquidTankTask,
// Query query) {
if(null != detailAfter){
one.setAfterFormulaContent(detailAfter.getContent());
}
IPage<LiquidTankTaskVO> pagesVO = service.selectLiquidTankTaskPageByJoin(
Condition.getPage(query), liquidTankTask
);
Long goodId = tank.getDrugMaterialId();
StGoods good = new StGoods();
good.setId(goodId);
StGoods stGoods = stRealtimeStockClient.getById(good).getData();
one.setDrugMaterialCode(stGoods.getGoodsCode());
QueryWrapper<WorkTank> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ID",one.getWorkTankId());
List<WorkTank> records = tankService.list(queryWrapper);
if(null != records && records.size()>0){
one.setWorkTankName(records.get(0).getWorkTankCode());
}
}
pagesVO.getRecords()
.stream()
.peek(service::setVOValue)
.collect(Collectors.toList());
return R.data(pagesVO);
//
// QueryWrapper<LiquidTankTask> qw = Condition.getQueryWrapper(liquidTankTask, LiquidTankTask.class);
// qw.ne(BaseCol.STATUS, LiquidTankTaskConst.S_NOT_READY);
// IPage<LiquidTankTask> pages = service.page(Condition.getPage(query), qw);
// IPage<LiquidTankTaskVO> pagesVO = LiquidTankTaskWrapper.build().pageVO(pages);
//
// List<LiquidTankTaskVO> list = pagesVO.getRecords();
// for(LiquidTankTaskVO one : list){
// LiquidTank tank = taskService.getById(one.getLiquidTankId());
// if(null != tank){
// Formula detail = formualaService.getById(tank.getAddDrugFormulaId());
// if(null != detail){
// one.setAddFormulaContent(detail.getContent());
// }
//
// Formula detailAfter = formualaService.getById(tank.getAfterTheoryFormulaId());
// if(null != detailAfter){
// one.setAfterFormulaContent(detailAfter.getContent());
// }
// }
//
//
//
// Long goodId = tank.getDrugMaterialId();
// StGoods good = new StGoods();
// good.setId(goodId);
// StGoods stGoods = stRealtimeStockClient.getById(good).getData();
// one.setDrugMaterialCode(stGoods.getGoodsCode());
//
// QueryWrapper<WorkTank> queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("ID",one.getWorkTankId());
// List<WorkTank> records = tankService.list(queryWrapper);
// if(null != records && records.size()>0){
// one.setWorkTankName(records.get(0).getWorkTankCode());
// }
// }
// pagesVO.getRecords()
// .stream()
// .peek(service::setVOValue)
// .collect(Collectors.toList());
// return R.data(pagesVO);
}
/**

8
blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java
Unescape View File

@ -144,10 +144,10 @@ public class LiquidTankTaskCopyController extends BladeController {
}
}
pagesVO.getRecords()
.stream()
.peek(service::setVOValue)
.collect(Collectors.toList());
// pagesVO.getRecords()
// .stream()
// .peek(service::setVOValue)
// .collect(Collectors.toList());
return R.data(pagesVO);
}

1
blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.java
Unescape View File

@ -29,6 +29,7 @@ public interface LiquidTankTaskMapper extends BaseMapper<LiquidTankTask> {
* @return List<LiquidTankTaskVO>
*/
List<LiquidTankTaskVO> selectLiquidTankTaskPage(IPage page, LiquidTankTaskVO liquidTankTask);
List<LiquidTankTaskVO> selectLiquidTankTaskPageByJoin(IPage page, @Param("task") LiquidTankTaskVO liquidTankTask);
/**
* 获取导出数据

20
blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml
Unescape View File

@ -69,6 +69,26 @@
WHERE is_deleted = 0
</select>
<select id="selectLiquidTankTaskPageByJoin" resultType="org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO">
SELECT task.*,formula.content as addFormulaContent,formula1.content as afterFormulaContent,
worktank.WORK_TANK_CODE as workTankName,good.goods_code as drugMaterialCode
FROM QA_LIQUID_TANK_TASK task
left join QA_LIQUID_TANK tank on task.LIQUID_TANK_ID = tank.id
left join BS_FORMULA formula on tank.ADD_DRUG_FORMULA_ID = formula.id
left join BS_FORMULA formula1 on tank.AFTER_THEORY_FORMULA_ID = formula1.id
left join BS_WORK_TANK worktank on task.WORK_TANK_ID = worktank.id
left join ST_GOODS good on good.id = tank.DRUG_MATERIAL_ID
WHERE task.is_deleted = 0
<if test = "task.workCenterId != null and task.workCenterId != ''">
AND task.WORK_CENTER_ID = #{task.workCenterId}
</if>
<if test = "task.status != null and task.status != ''">
AND task.STATUS = #{task.status}
</if>
</select>
<select id="exportLiquidTankTask"
resultType="org.springblade.desk.quality.excel.LiquidTankTaskExcel">
SELECT *

1
blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java
Unescape View File

@ -28,6 +28,7 @@ public interface ILiquidTankTaskService extends BaseService<LiquidTankTask> {
* @return IPage<LiquidTankTaskVO>
*/
IPage<LiquidTankTaskVO> selectLiquidTankTaskPage(IPage<LiquidTankTaskVO> page, LiquidTankTaskVO liquidTankTask);
IPage<LiquidTankTaskVO> selectLiquidTankTaskPageByJoin(IPage<LiquidTankTaskVO> page, LiquidTankTaskVO liquidTankTask);
/**
* 导出数据

9
blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java
Unescape View File

@ -98,6 +98,12 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
return page.setRecords(baseMapper.selectLiquidTankTaskPage(page, liquidTankTask));
}
@Override
public IPage<LiquidTankTaskVO> selectLiquidTankTaskPageByJoin(IPage<LiquidTankTaskVO> page,
LiquidTankTaskVO liquidTankTask) {
return page.setRecords(baseMapper.selectLiquidTankTaskPageByJoin(page, liquidTankTask));
}
@Override
public List<LiquidTankTaskExcel> exportLiquidTankTask(Wrapper<LiquidTankTask> queryWrapper) {
List<LiquidTankTaskExcel> liquidTankTaskList = baseMapper.exportLiquidTankTask(queryWrapper);
@ -550,9 +556,10 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
task.setStatus(newStatus);
taskCopy.setStatus(newStatus);
task.setValidDate(taskCopy.getValidDate());
// 更新状态
updateById(task);
taskCopy.setValidDate(task.getValidDate());
// taskCopy.setValidDate(task.getValidDate());
copyService.updateById(taskCopy);
// history
LiquidTankTaskHi hi = new LiquidTankTaskHi();

Write Preview
Loading…
Cancel
Save