Changes

Fixiaobai

2023-11-01 b3d49fc7da8274bfabc0eee6066ab0a24cdd76e2

Changes

 mes-basic/src/main/java/com/chinaztt/mes/basic/controller/DivisionController.java

@@ -18,6 +18,7 @@
package com.chinaztt.mes.basic.controller;

import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaztt.mes.basic.entity.Division;
@@ -94,7 +95,6 @@
    @PostMapping
    @PreAuthorize("@pms.hasPermission('basic_division_add')")
    public R save(@RequestBody Division division) {
        System.out.println(division);
        return R.ok(divisionService.save(division));
    }
    /**
@@ -167,7 +167,8 @@
    @PostMapping("/adddivision")
    @PreAuthorize("@pms.hasPermission('basic_division_add')")
    public R addDivision(@RequestBody Division division) {
        if (division.getId().equals(0L)) {
        System.err.println("=========================================================================》"+division);
        if (division.getId().equals(0L)) {
            //判断编号是否重复
            Division divisionByFind=divisionService.getOne(Wrappers.<Division>lambdaQuery().eq(Division::getDivisionNo, division.getDivisionNo()));
            if(divisionByFind!=null){
@@ -182,4 +183,11 @@

    }

    @GetMapping("/getDivisionByFactoryId")
    public R getDivisionByFactoryId(Long id,Long factoryId){
        QueryWrapper<Division> queryWrapper = new QueryWrapper<>();
        queryWrapper.lambda().eq(Division::getFactoryId,factoryId).eq(Division::getCompanyId,id);
        return R.ok(divisionService.getBaseMapper().selectList(queryWrapper));
    }

}

 mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PostController.java

@@ -1,5 +1,6 @@
package com.chinaztt.mes.basic.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaztt.mes.basic.entity.Post;
import com.chinaztt.mes.basic.service.PostService;
@@ -109,4 +110,11 @@
        return R.ok(postService.removeById(id));
    }

    @GetMapping("/getObjById")
    public R getObjById(Long id ,Long factoryId ,Long divisionId){
        QueryWrapper<Post>queryWrapper=new QueryWrapper<>();
        queryWrapper.lambda().eq(Post::getCompanyId,id).eq(Post::getFactoryId,factoryId).eq(Post::getDivisionId,divisionId);
        return R.ok(postService.list(queryWrapper));
    }

}

 mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Division.java

@@ -97,7 +97,6 @@
    @ApiModelProperty(value = "更新者")
    private String updateUser;


    @TableLogic
    private Boolean active;

@@ -107,11 +106,9 @@
    @TableField(exist = false)
    private String companyName;

    @TableField(exist = false)
    private String factoryId;
    private Long factoryId;
    /**
     * 工厂名
     */
    @TableField(exist = false)
    private String factoryName;
}

 mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Post.java

@@ -48,16 +48,31 @@
    /**
     * 公司
     */
    private Long company;
    private Long companyId;

    /**
     * 工厂
     */
    private Long factory;
    private Long factoryId;


    /**
     * 部门
     */
    private Long division;
    private Long divisionId;

    /**
     * 工厂名
     */
    private String factoryName;

    /**
     * 部门名
     */
    private String divisionName;

    /**
     * 部门名
     */
    private String companyName;
}

 mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Staff.java

@@ -23,8 +23,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.RequiredArgsConstructor;

import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -126,4 +124,27 @@

    @ApiModelProperty(value = "试用截至日期")
    private String trialDeadline;

    /**
     * 公司
     */
    private Long companyId;

    /**
     * 工厂
     */
    private Long factoryId;



    /**
     * 工厂名
     */
    private String factoryName;


    /**
     * 公司名
     */
    private String companyName;
}

 mes-basic/src/main/java/com/chinaztt/mes/basic/mapper/DivisionMapper.java

@@ -22,8 +22,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaztt.mes.basic.entity.Division;
import com.chinaztt.mes.basic.entity.Factory;
import com.chinaztt.ztt.common.data.datascope.DataScope;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -48,4 +46,5 @@
     */
    IPage<List<Division>> getDivisionPage(Page page, @Param("ew") QueryWrapper<Division> ew);

    int insertDivision(Division division);
}

 mes-basic/src/main/resources/mapper/DivisionMapper.xml

@@ -29,6 +29,8 @@
        <result property="divisionName" column="division_name"/>
        <result property="remark" column="remark"/>
        <result property="staffName" column="staff_name"/>
        <result property="factoryId" column="factory_id"/>
        <result property="factoryName" column="factory_name"/>
        <result property="companyName" column="company_name"/>
        <result property="createTime" column="create_time"/>
        <result property="updateTime" column="update_time"/>

 mes-basic/src/main/resources/mapper/PostMapper.xml

@@ -8,6 +8,12 @@
        <id property="id" column="id"/>
        <result property="postNo" column="post_no"/>
        <result property="postName" column="post_name"/>
        <result property="factoryId" column="factory_id"/>
        <result property="factoryName" column="factory_name"/>
        <result property="divisionId" column="division_id"/>
        <result property="divisionName" column="division_name"/>
        <result property="companyId" column="company_id"/>
        <result property="companyName" column="company_name"/>
        <result property="remark" column="remark"/>
    </resultMap>
</mapper>

 mes-basic/src/main/resources/mapper/StaffMapper.xml

@@ -40,6 +40,11 @@
        <result property="crewId" column="crew_id"/>
        <result property="personNature" column="person_nature"/>
        <result property="trialDeadline" column="trial_deadline"/>
<!--        <result property="divisionName" column="division_name"/>-->
        <result property="factoryId" column="factory_id"/>
        <result property="factoryName" column="factory_name"/>
        <result property="companyId" column="company_id"/>
        <result property="companyName" column="company_name"/>
    </resultMap>


@@ -48,7 +53,7 @@
        staff."id",staff.division_id,staff.staff_no,staff.staff_name,
                staff.phone,staff.email,bp.post_name post,staff.create_time,staff.update_time,
                staff.create_user,staff.update_user,staff.active,staff.personnel_factor,staff.post_id,
        division.division_name division_name,staff.person_nature,staff.trial_deadline
        division.division_name division_name,staff.person_nature,staff.trial_deadline,staff.company_name,staff.factory_name
        FROM
        basic_staff staff
                left join basic_post bp on bp."id"=staff.post_id