zouyu
2024-03-14 a06309c39436991b9cb7aff40a77df224cab669f
业务管理:检验任务
已修改3个文件
已添加4个文件
136 ■■■■■ 文件已修改
framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/com/yuanchu/mom/common/PrintChina.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java
@@ -8,4 +8,6 @@
    int value() default 1;
    String name() default "";
}
framework/src/main/java/com/yuanchu/mom/common/PrintChina.java
@@ -26,14 +26,12 @@
            Map<String, String> soundVo = new HashMap<>();
            boolean bool = field.isAnnotationPresent(ApiModelProperty.class);
            boolean bool2 = field.isAnnotationPresent(ValueTableShow.class);
            if (bool) {
                int order;
                if (bool2){
                    order = field.getAnnotation(ValueTableShow.class).value();
                }else{
                    continue;
            if (bool2) {
                int order = field.getAnnotation(ValueTableShow.class).value();
                String value = field.getAnnotation(ValueTableShow.class).name();
                if (bool){
                    value = value.isEmpty() ? field.getAnnotation(ApiModelProperty.class).value() : value;
                }
                String value = field.getAnnotation(ApiModelProperty.class).value();
                soundVo.put("label", field.getName());
                soundVo.put("value", value);
                soundVo.put("order", order + "");
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
package com.yuanchu.mom.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
/**
 * æ£€éªŒä»»åŠ¡-控制层
 */
@RestController
@RequestMapping("/insOrderPlan")
@AllArgsConstructor
public class InsOrderPlanController {
    private InsOrderPlanService insOrderPlanService;
    @ApiOperation(value = "获取检验任务列表")
    @PostMapping("/selectInsOrderPlanList")
    public Result selectInsOrderPlanList(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
        InsOrder enums = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsOrder.class);
        return Result.success(insOrderPlanService.selectInsOrderPlanList(page, enums));
    }
}
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
@@ -167,4 +167,13 @@
    private Integer userId;
    @ApiModelProperty(value = "检验状态(0:待检验1:检验中 2:已检验3:待复核4:复核未通过5:复核通过)")
    private Integer insState;
    @ApiModelProperty(value = "检验结果(0:不合格 1:合格)")
    private Integer insResult;
    @ApiModelProperty(value = "下发时间")
    private LocalDateTime sendTime;
}
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package com.yuanchu.mom.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.InsOrder;
import java.util.Map;
/**
 * æ£€éªŒä»»åŠ¡-业务层
 */
public interface InsOrderPlanService {
    Map<String,Object> selectInsOrderPlanList(Page page, InsOrder enums);
}
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
package com.yuanchu.mom.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.mapper.InsOrderMapper;
import com.yuanchu.mom.mapper.InsOrderUserMapper;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.pojo.InsOrderUser;
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
 * æ£€éªŒä»»åŠ¡-业务实现层
 */
@Service
@AllArgsConstructor
public class InsOrderPlanServiceImpl extends ServiceImpl<InsOrderMapper, InsOrder> implements InsOrderPlanService {
    private InsOrderMapper insOrderMapper;
    private InsOrderUserMapper insOrderUserMapper;
    private GetLook getLook;
    @Override
    public Map<String, Object> selectInsOrderPlanList(Page page, InsOrder insOrder) {
        Page<InsOrder> insOrderPage = new Page<>();
        insOrderPage.setCurrent(page.getCurrent());
        insOrderPage.setPages(page.getPages());
        insOrderPage.setSize(page.getSize());
        Map<String, Object> map = new HashMap<>();
        map.put("head", PrintChina.printChina(InsOrder.class));
        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderPlanList");
        Integer userId = map1.get("userId");
        if (map1.get("look") == 1) insOrder.setCreateUser(userId);
        List<InsOrder> orderPage = insOrderMapper.selectList(QueryWrappers.queryWrappers(insOrder));
        List<InsOrder> filterData = orderPage.stream().filter(order -> {
            List<InsOrderUser> insOrderUsers = insOrderUserMapper.selectList(Wrappers.<InsOrderUser>lambdaQuery()
                    .eq(InsOrderUser::getInsOrderId, order.getId()));
            boolean isZero = insOrderUsers.stream().noneMatch(iou -> iou.getUserId().equals(userId));
            return insOrderUsers.isEmpty() || !isZero;
        }).collect(Collectors.toList());
        insOrderPage.setTotal(filterData.size());
        map.put("body", insOrderPage);
        return map;
    }
}
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
package com.yuanchu.mom.vo;
import com.yuanchu.mom.common.OrderBy;
import lombok.Data;
@Data
public class InsOrderPlanVO extends OrderBy {
}