Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after

晏有为

2024-05-27 27421a34661fed2e141ab9aaa7447926aea46e36

Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after

 cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java

@@ -1,16 +1,9 @@
package com.yuanchu.mom.controller;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Console;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil;
import cn.hutool.poi.excel.ExcelReader;
import cn.hutool.poi.excel.ExcelUtil;
import cn.hutool.poi.excel.sax.handler.RowHandler;
import com.alibaba.excel.util.StringUtils;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
@@ -29,15 +22,10 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.*;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.Arrays;
import java.util.Map;

/**
 * æ£€éªŒé¡¹ç›®å‚æ•°(StructureItemParameter)表控制层
@@ -174,7 +162,7 @@
    private EnumService enumService;

    @ValueClassify(value = "能力范围")
    @ApiOperation(value = "导入")
    @ApiOperation(value = "导入检验项目")
    @PostMapping("/importData")
    @Transactional
    public Result importData(@RequestParam("file") MultipartFile file) throws Exception {

 framework/src/main/java/com/yuanchu/mom/controller/InformationNotificationController.java

@@ -10,6 +10,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Map;

/**
 * <p>
 * æ¶ˆæ¯é€šçŸ¥ å‰ç«¯æŽ§åˆ¶å™¨
@@ -71,4 +73,12 @@
        informationNotificationService.triggerModificationStatusToRead(id);
        return Result.success();
    }

    @ApiOperation(value = "消息通知-获取首页四种消息数量")
    @GetMapping("getNumberFourTypesMessagesHomePage")
    @ValueAuth
    public Result<?> getNumberFourTypesMessagesHomePage() {
        Map<String, Object> data = informationNotificationService.getNumberFourTypesMessagesHomePage();
        return Result.success(data);
    }
}

 framework/src/main/java/com/yuanchu/mom/service/InformationNotificationService.java

@@ -6,6 +6,8 @@
import com.yuanchu.mom.pojo.InformationNotification;
import com.yuanchu.mom.pojo.InformationNotificationDto;

import java.util.Map;

/**
 * <p>
 * æ¶ˆæ¯é€šçŸ¥ æœåŠ¡ç±»
@@ -25,4 +27,6 @@
    void triggerModificationStatusToRead(Integer id);

    int addInformationNotification(InformationNotification informationNotification);

    Map<String, Object> getNumberFourTypesMessagesHomePage();
}

 framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java

@@ -12,6 +12,8 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.time.LocalDate;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -76,4 +78,27 @@
    public int addInformationNotification(InformationNotification informationNotification) {
        return baseMapper.insert(informationNotification);
    }

    @Override
    public Map<String, Object> getNumberFourTypesMessagesHomePage() {
        Map<String, Integer> map1 = null;
        Map<String, Object> map = new HashMap<>();
        map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderParameter");
        Long totalNumberOfMessages = baseMapper.selectCount(Wrappers.<InformationNotification>lambdaQuery()
                .eq(InformationNotification::getConsigneeId, map1.get("userId")));
        Long totalNumberOfReadMessages = baseMapper.selectCount(Wrappers.<InformationNotification>lambdaQuery()
                .eq(InformationNotification::getConsigneeId, map1.get("userId"))
                .eq(InformationNotification::getViewStatus, true));
        LocalDate today = LocalDate.now();
        LocalDate sevenDaysAgo = today.minusDays(7);
        Long totalNumberOfMessagesInThePastSevenDays = baseMapper.selectCount(Wrappers.<InformationNotification>lambdaQuery()
                .eq(InformationNotification::getConsigneeId, map1.get("userId"))
                .between(InformationNotification::getCreateTime, today, sevenDaysAgo));
        long remainingToDo = totalNumberOfMessages - totalNumberOfReadMessages;
        map.put("totalNumberOfMessages", totalNumberOfMessages);
        map.put("remainingToDo", remainingToDo);
        map.put("totalNumberOfReadMessages", totalNumberOfReadMessages);
        map.put("totalNumberOfMessagesInThePastSevenDays", totalNumberOfMessagesInThePastSevenDays);
        return map;
    }
}

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java

@@ -38,6 +38,17 @@
        InsOrderPlanDTO insOrderPlanDTO = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsOrderPlanDTO.class);
        return Result.success(insOrderPlanService.selectInsOrderPlanList(page, insOrderPlanDTO));
    }

    @ValueClassify("检验任务")
    @ApiOperation(value = "检验单详情-任务切换")
    @PostMapping("/inspectionOrderDetailsTaskSwitching")
    public Result inspectionOrderDetailsTaskSwitching(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
        page.setOptimizeCountSql(false);
        InsOrderPlanDTO insOrderPlanDTO = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsOrderPlanDTO.class);
        return Result.success(insOrderPlanService.inspectionOrderDetailsTaskSwitching(page, insOrderPlanDTO));
    }

    @ValueClassify("检验任务")
    @ApiOperation(value = "认领任务计划")
    @PostMapping("/claimInsOrderPlan")

 inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java

@@ -22,31 +22,32 @@
    private ReportService reportService;

    @ValueClassify("统计图表")
    @ApiOperation(value = "每日业务统计")
    @ApiOperation(value = "查询每日业务统计")
    @GetMapping("/businessStatisticsByDay")
    public Result businessStatisticsByDay(){
        return Result.success(reportService.businessStatisticsByDay());
    }
    @ValueClassify("统计图表")
    @ApiOperation(value = "检测项目统计")
    @ApiOperation(value = "查询检测项目统计")
    @GetMapping("/testProductByDay")
    public Result testProductByDay(){
        return Result.success(reportService.testProductByDay());
    }
    @ValueAuth
    @ApiOperation(value = "日历任务图")
    @ApiOperation(value = "查询日历任务图")
    @GetMapping("/calendarWorkByWeek")
    public Result calendarWorkByWeek(){
        return Result.success(reportService.calendarWorkByWeek());
    }
    @ValueClassify("个人首页")

    @ValueAuth
    @ApiOperation(value = "添加日程")
    @PostMapping("/addSchedule")
    public Result addSchedule(String time, String text){
        return Result.success(reportService.addSchedule(time,text));
    }
    @ValueAuth
    @ApiOperation(value = "我的日程")
    @ApiOperation(value = "查询我的日程")
    @PostMapping("/ScheduleByMe")
    public Result ScheduleByMe(String date){
        return Result.success(reportService.ScheduleByMe(date));

 inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java

@@ -62,9 +62,9 @@
        return Result.success(standardTemplateService.getStandTempThingById(id));
    }

    @ValueAuth
    @ApiOperation(value = "编辑模板编制")
    @GetMapping("/getEditTemplatePreparation")
    @ValueClassify("标准库")
    public Result<?> getEditTemplatePreparation(@RequestParam("id") Integer id) {
        StandardTemplate byId = standardTemplateService.getById(id);
        return Result.success("OK", byId.getThing());

 inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java

@@ -49,7 +49,6 @@
    @ValueTableShow(value = 14, name = "是否合格")
    private Integer insResult;

    @ValueTableShow(value = 16, name = "设备")
    private String equipValue;

}

 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java

@@ -7,6 +7,7 @@
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo;
import com.yuanchu.mom.vo.InsOrderPlanVO;

import java.util.List;
@@ -21,6 +22,8 @@

    IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, QueryWrapper<InsOrderPlanDTO> ew, Integer userId);

    IPage<InsOrderPlanTaskSwitchVo> inspectionOrderDetailsTaskSwitching(Page page, QueryWrapper<InsOrderPlanDTO> ew, Integer userId);

    List<SampleProductDto> selectSampleProductListByOrderId(Integer id);

    List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory);

 inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java

@@ -2,8 +2,6 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.pojo.InsSample;

import java.util.Map;

@@ -13,6 +11,8 @@
public interface InsOrderPlanService {
    Map<String,Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO);

    Map<String,Object> inspectionOrderDetailsTaskSwitching(Page page, InsOrderPlanDTO insOrderPlanDTO);

    boolean claimInsOrderPlan(InsOrderPlanDTO entity);

    void saveInsContext(Map<String, Object> insContext);

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java

@@ -33,6 +33,7 @@
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.MatrixToImageWriter;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo;
import com.yuanchu.mom.vo.InsOrderPlanVO;
import org.apache.commons.io.IOUtils;
import org.apache.poi.xwpf.usermodel.*;
@@ -114,6 +115,20 @@
    }

    @Override
    public Map<String, Object> inspectionOrderDetailsTaskSwitching(Page page, InsOrderPlanDTO insOrderPlanDTO) {
        Map<String, Object> map = new HashMap<>();
        map.put("head", PrintChina.printChina(InsOrderPlanTaskSwitchVo.class));
        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
        Integer userId = map1.get("userId");
        if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
            insOrderPlanDTO.setUserId(userId.longValue());
        }
        IPage<InsOrderPlanTaskSwitchVo> insOrderPage = insSampleMapper.inspectionOrderDetailsTaskSwitching(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId);
        map.put("body", insOrderPage);
        return map;
    }

    @Override
    public boolean claimInsOrderPlan(InsOrderPlanDTO entity) {
        if (Objects.isNull(entity)) {
            return false;

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java

@@ -56,7 +56,10 @@
        String[] models = insSample.getModel().split("-(?=[^-]*$)");//拆分最后一个【-】
        List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1).eq(StandardProductList::getModel, models[0]));
        if (list.size() == 0) {
            list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1));
            list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
                    .eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId())
                    .eq(StandardProductList::getState, 1)
                    .like(StandardProductList::getTree, insSample.getFactory().split("-(?=[^-]*$)")[0]));
        }
        list = list.stream().filter(a -> {
            try {
@@ -66,26 +69,13 @@
                    List<String> tells = JSON.parseArray(a.getTell(), String.class);
                    List<String> manHours = JSON.parseArray(a.getManHour(), String.class);
                    List<String> prices = JSON.parseArray(a.getPrice(), String.class);
                    boolean isIf = false;
                    boolean isIf;
                    for (int i = 0; i < sections.size(); i++) {
                        if (sections.get(i).contains("&")) {
                            String[] split = sections.get(i).split("&");
                            isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(split[0])) > -1 && new BigDecimal(models[1]).compareTo(new BigDecimal(split[1])) < 1;
                        } else if (sections.get(i).contains("≥") || sections.get(i).contains(">=")) {
                            String param = sections.get(i).replace("≥", "").replace(">=", "");
                            isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(param)) > -1;
                        } else if (sections.get(i).contains("≤") || sections.get(i).contains("<=")) {
                            String param = sections.get(i).replace("≤", "").replace("<=", "");
                            isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(param)) < 1;
                        } else if (sections.get(i).contains(">")) {
                            String param = sections.get(i).replace(">", "");
                            isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(param)) > 0;
                        } else if (sections.get(i).contains("<")) {
                            String param = sections.get(i).replace("<", "");
                            isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(param)) < 0;
                        } else if (sections.get(i).contains("=")) {
                            String param = sections.get(i).replace("=", "");
                            isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(param)) == 0;
                            isIf = getIsIf(split[0], models[1]) && getIsIf(split[1], models[1]);
                        } else {
                            isIf = getIsIf(sections.get(i), models[1]);
                        }
                        if (isIf) {
                            a.setSection(sections.get(i));
@@ -106,6 +96,26 @@
        return list;
    }

    private boolean getIsIf(String str, String model){
        if (str.contains("≥") || str.contains(">=")) {
            String param = str.replace("≥", "").replace(">=", "");
            return new BigDecimal(model).compareTo(new BigDecimal(param)) > -1;
        } else if (str.contains("≤") || str.contains("<=")) {
            String param = str.replace("≤", "").replace("<=", "");
            return new BigDecimal(model).compareTo(new BigDecimal(param)) < 1;
        } else if (str.contains(">")||str.contains("＞")) {
            String param = str.replace(">", "").replace("＞", "");
            return new BigDecimal(model).compareTo(new BigDecimal(param)) > 0;
        } else if (str.contains("<")||str.contains("＜")) {
            String param = str.replace("<", "").replace("＜", "");
            return new BigDecimal(model).compareTo(new BigDecimal(param)) < 0;
        } else if (str.contains("=")) {
            String param = str.replace("=", "");
            return new BigDecimal(model).compareTo(new BigDecimal(param)) == 0;
        }
        return false;
    }

    @Override
    public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
        String[] trees = tree.split(" - ");

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java

@@ -113,7 +113,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public int upStandardProducts(Map<String, Object> product) {
        List<Integer> ids = JSON.parseArray(JSON.toJSONString(product.get("ids")));
        List<Integer> ids = JSON.parseArray(product.get("ids")+"");
        StandardProductList productList = JSON.parseObject(JSON.toJSONString(product.get("standardProductList")), StandardProductList.class);
        standardProductListMapper.update(productList, Wrappers.<StandardProductList>lambdaUpdate().in(StandardProductList::getId, ids));
        return 1;

 inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanTaskSwitchVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
package com.yuanchu.mom.vo;

import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
import lombok.Data;

@Data
public class InsOrderPlanTaskSwitchVo extends OrderBy {
    private String id;

    @ValueTableShow(value = 1,name = "委托编号")
    private String entrustCode;

    @ValueTableShow(value = 2,name = "检验对象")
    private String sampleType;

    @ValueTableShow(value = 4,name = "紧急程度")
    private String type;

    @ValueTableShow(value = 5,name = "状态")
    private String insState;

    @ValueTableShow(value = 6,name = "约定时间")
    private String appointed;

    @ValueTableShow(value = 7,name = "下发时间")
    private String sendTime;

    private Integer userId;

    private String sonLaboratory;

    private Integer orderUserId;

    private Integer verifyUser;
}

 inspect-server/src/main/resources/mapper/InsSampleMapper.xml

@@ -67,6 +67,48 @@
        </if>
    </select>

    <select id="inspectionOrderDetailsTaskSwitching" resultType="com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo">
        select * from(
        SELECT
        a.*,ios.ins_state,ios.verify_tell,isu2.order_user_id,(ios.verify_user = #{userId}) verify_user
        FROM
        (
        SELECT
        io.id,
        io.entrust_code,
        io.type,
        io.appointed,
        io.send_time,
        io.sample_type,
        isu.user_id,
        ip.son_laboratory,
        io.ins_time
        FROM
        ins_order io
        LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
        LEFT JOIN ( SELECT * FROM ins_sample_user GROUP BY ins_sample_id, user_id ) isu ON isu.ins_sample_id = io.id
        LEFT JOIN ins_product ip ON ip.ins_sample_id = isa.id
        WHERE
        io.state = 1
        #         AND io.ins_state != 5
        and send_time is not null
        and (isu.user_id = #{userId} OR isu.user_id is NULL)
        GROUP BY
        ip.son_laboratory,
        io.id
        ) a
        LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory
        left join (SELECT td.user_id order_user_id, td.ins_sample_id FROM ins_sample_user td,(SELECT max(id) id FROM ins_sample_user GROUP BY ins_sample_id) md  where td.id = md.id and user_id = #{userId}) isu2 on isu2.ins_sample_id = a.id
        ORDER BY
        a.user_id DESC,
        a.type DESC,
        a.id
        ) b
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
    </select>

    <select id="selectSampleProductListByOrderId" resultMap="sampleDto">
        select isa.*,
               ip.id ip_id,

 inspect-server/src/main/resources/static/report-template.docx

Binary files differ

 user-server/src/main/java/com/yuanchu/mom/controller/UserController.java

@@ -100,7 +100,7 @@
    }

    @ValueClassify("人员总览")
    @ApiOperation(value = "人员总览")
    @ApiOperation(value = "查询人员总览")
    @PostMapping("/selectPersonnelOverview")
    public Result selectPersonnelOverview(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);

 user-server/src/main/java/com/yuanchu/mom/dto/Custom.java

@@ -84,4 +84,9 @@

    private Integer isCustom;

    @ApiModelProperty(value = "英文客户单位")
    private String companyEn;

    @ApiModelProperty(value = "英文单位地址")
    private String addressEn;
}

 user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java

@@ -126,7 +126,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public int addPersonUser(PersonDto personDto) {
        AtomicReference<String> departId = new AtomicReference<>("");
        AtomicReference<String> departId = new AtomicReference<>("1,");
        AtomicReference<String> companyName = new AtomicReference<>();
        personDto.getCompany().forEach(company -> {
            Departments department = departmentsMapper.selectOne(Wrappers.<Departments>lambdaQuery().eq(Departments::getCompanyId, company.getCompanyId()));

 user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java

@@ -18,7 +18,6 @@

import javax.annotation.Resource;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

@@ -73,10 +72,11 @@
        }catch (Exception e){
            throw new ErrorException(e.getMessage());
        }
        return companies.stream().filter(ob->{
        /*return companies.stream().filter(ob->{
            if(ob.getStatus().equals("enabled")) return true;
            return false;
        }).collect(Collectors.toList());
        }).collect(Collectors.toList());*/
        return companies;
    }

    public List<Person> userUrl(String companyId) {
@@ -91,11 +91,8 @@
            throw new ErrorException(e.getMessage());
        }
        return person.stream().filter(ob->{
            if(Objects.equals(ob.getStatus(), "enabled")) {
                ob.setIsLive(userMapper.selectCount(Wrappers.<User>lambdaQuery().eq(User::getAccount, ob.getEmployeeID())));
                return true;
            }
            return false;
            ob.setIsLive(userMapper.selectCount(Wrappers.<User>lambdaQuery().eq(User::getAccount, ob.getEmployeeID())));
            return true;
        }).collect(Collectors.toList());
    }