Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-10 db05e7296bcef514ae3f204971ebbdd502019041

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java

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

@@ -10,6 +10,7 @@
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -22,6 +23,7 @@

@RestController
@RequestMapping("/insReport")
//@AllArgsConstructor
@Api("检验报告")
public class InsReportController {

@@ -30,6 +32,7 @@

    @Value("${wordUrl}")
    private String wordUrl;

    @ValueAuth
    @ApiOperation(value = "查询检验报告数据")
    @PostMapping("/pageInsReport")

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

@@ -77,7 +77,7 @@
        insOrderMapper.updateById(insOrder);
        List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
        List<Integer> ids = insSamples.stream().map(a-> a.getId()).collect(Collectors.toList());
        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).select(InsProduct::getSonLaboratory).groupBy(InsProduct::getSonLaboratory));
        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getState, 1).select(InsProduct::getSonLaboratory).groupBy(InsProduct::getSonLaboratory));
        for (InsProduct insProduct : insProducts) {
            InsOrderState insOrderState = new InsOrderState();
            insOrderState.setInsOrderId(orderId);

 performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursController.java

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.AuxiliaryWorkingHours;
import com.yuanchu.mom.service.AuxiliaryWorkingHoursService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.Map;

/**
 * <p>
 * è¾…助工时 å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-09 06:58:31
 */
@Api(tags = "绩效管理-辅助工时设置")
@AllArgsConstructor
@RestController
@RequestMapping("/auxiliaryWorkingHours")
public class AuxiliaryWorkingHoursController {
    @Resource
    private AuxiliaryWorkingHoursService auxiliaryWorkingHoursService;

    @ApiOperation(value="查询辅助工时")
    @PostMapping("/selectAuxiliaryWorkingHours")
    public Result selectAuxiliaryWorkingHours(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
        AuxiliaryWorkingHours entity = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), AuxiliaryWorkingHours.class);
        return Result.success(auxiliaryWorkingHoursService.selectAuxiliaryWorkingHours(page,entity));
    }
    @ValueClassify("工时管理")
    @ApiOperation(value="删除辅助工时")
    @PostMapping("/deleteAuxiliaryWorkingHours")
    public Result deleteAuxiliaryWorkingHours(Integer id){
        return Result.success(auxiliaryWorkingHoursService.deleteAuxiliaryWorkingHours(id));
    }
    @ValueClassify("工时管理")
    @ApiOperation(value="修改辅助工时")
    @PostMapping("/upAuxiliaryWorkingHours")
    public Result upAuxiliaryWorkingHours(@RequestBody AuxiliaryWorkingHours auxiliaryWorkingHours){
        return Result.success(auxiliaryWorkingHoursService.upAuxiliaryWorkingHours(auxiliaryWorkingHours));
    }
    @ValueClassify("工时管理")
    @ApiOperation(value="新增辅助工时")
    @PostMapping("/insertAuxiliaryWorkingHours")
    public  Result insertAuxiliaryWorkingHours(@RequestBody AuxiliaryWorkingHours auxiliaryWorkingHours){
        return Result.success(auxiliaryWorkingHoursService.insertAuxiliaryWorkingHours(auxiliaryWorkingHours));
    }


}

 performance-server/src/main/java/com/yuanchu/mom/mapper/AuxiliaryWorkingHoursMapper.java

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.AuxiliaryWorkingHours;

/**
 * <p>
 * è¾…助工时 Mapper æŽ¥å£
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-09 06:58:31
 */
public interface AuxiliaryWorkingHoursMapper extends BaseMapper<AuxiliaryWorkingHours> {
    IPage<AuxiliaryWorkingHours> selectAuxiliaryWorkingHours(Page page, QueryWrapper<AuxiliaryWorkingHours> ew);
}

 performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryWorkingHours.java

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

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;

import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import jdk.nashorn.internal.ir.annotations.Ignore;
import lombok.Getter;
import lombok.Setter;

/**
 * <p>
 * è¾…助工时
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-09 06:58:31
 */
@Getter
@Setter
@TableName("auxiliary_working_hours")
@ApiModel(value = "AuxiliaryWorkingHours对象", description = "辅助工时")
public class AuxiliaryWorkingHours extends OrderBy implements Serializable {
    @ApiModelProperty("主键ID")
    @TableId(type = IdType.AUTO)
    private Integer id;
    @ValueTableShow(2)
    @ApiModelProperty("编号")
    private String number;
    @ValueTableShow(3)
    @ApiModelProperty("辅助项目名称")
    private String auxiliaryProject;
    @ValueTableShow(5)
    @ApiModelProperty("核准工时")
    private Float approvedWorkingHour;
    @ValueTableShow(7)
    @ApiModelProperty("备注")
    private String remarks;

    @ApiModelProperty("创建人id")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @ApiModelProperty("修改人id")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ApiModelProperty("修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty("外键：字典id（单位）")
    private Integer eId;
    @ValueTableShow(6)
    @ApiModelProperty("部门")
    private String department;
    @ValueTableShow(3)
    @ApiModelProperty("实验室")
    private String laboratory;
    @ValueTableShow(4)
    @TableField(exist = false)
    @ApiModelProperty("单位")
    private String label;
}

 performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursService.java

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.AuxiliaryWorkingHours;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.Map;

/**
 * <p>
 * è¾…助工时 æœåŠ¡ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-09 06:58:31
 */
public interface AuxiliaryWorkingHoursService extends IService<AuxiliaryWorkingHours> {
    Map<String, Object> selectAuxiliaryWorkingHours(Page page, AuxiliaryWorkingHours auxiliaryWorkingHours);
    int deleteAuxiliaryWorkingHours(Integer id);
    int upAuxiliaryWorkingHours(AuxiliaryWorkingHours auxiliaryWorkingHours);
    int insertAuxiliaryWorkingHours(AuxiliaryWorkingHours auxiliaryWorkingHours);
}

 performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursServiceImpl.java

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.pojo.AuxiliaryWorkingHours;
import com.yuanchu.mom.mapper.AuxiliaryWorkingHoursMapper;
import com.yuanchu.mom.service.AuxiliaryWorkingHoursService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.utils.QueryWrappers;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;

/**
 * <p>
 * è¾…助工时 æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author æ±Ÿè‹éµ·é›ç½‘络科技有限公司
 * @since 2024-05-09 06:58:31
 */
@Service
public class AuxiliaryWorkingHoursServiceImpl extends ServiceImpl<AuxiliaryWorkingHoursMapper, AuxiliaryWorkingHours> implements AuxiliaryWorkingHoursService {

    @Resource
    private  AuxiliaryWorkingHoursMapper auxiliaryWorkingHoursMapper;
    @Override
    public Map<String, Object> selectAuxiliaryWorkingHours(Page page, AuxiliaryWorkingHours auxiliaryWorkingHours) {
        Map<String, Object> map = new HashMap<>();
        map.put("head", PrintChina.printChina(AuxiliaryWorkingHours.class));
        map.put("body", auxiliaryWorkingHoursMapper.selectAuxiliaryWorkingHours(page, QueryWrappers.queryWrappers(auxiliaryWorkingHours)));
        return map;
    }

    @Override
    public int deleteAuxiliaryWorkingHours(Integer id) {
        return auxiliaryWorkingHoursMapper.deleteById(id);
    }

    @Override
    public int upAuxiliaryWorkingHours(AuxiliaryWorkingHours auxiliaryWorkingHours) {
        return auxiliaryWorkingHoursMapper.updateById(auxiliaryWorkingHours);
    }

    @Override
    public int insertAuxiliaryWorkingHours(AuxiliaryWorkingHours auxiliaryWorkingHours) {
        return auxiliaryWorkingHoursMapper.insert(auxiliaryWorkingHours);
    }
}

 performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.AuxiliaryWorkingHoursMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.AuxiliaryWorkingHours">
        <id column="id" property="id" />
        <result column="AuxiliaryProject" property="auxiliaryProject" />
        <result column="approved_working_hour" property="approvedWorkingHour" />
        <result column="remarks" property="remarks" />
        <result column="create_user" property="createUser" />
        <result column="update_user" property="updateUser" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="e_id" property="eId" />
        <result column="department" property="department" />
        <result column="laboratory" property="laboratory" />
    </resultMap>
  <select id="selectAuxiliaryWorkingHours" resultType="com.yuanchu.mom.pojo.AuxiliaryWorkingHours">
      select data.*
      from (
      select
      awh.id,
      awh.number,
      awh.auxiliary_project,
      awh.laboratory,
      enu.label,
      awh.approved_working_hour,
      awh.department,
      awh.remarks
      FROM auxiliary_working_hours awh
      left JOIN enums enu on enu.id = awh.e_id
      ) data
      <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
          ${ew.customSqlSegment}
      </if>
  </select>
</mapper>