From b3d49fc7da8274bfabc0eee6066ab0a24cdd76e2 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 01 十一月 2023 15:12:51 +0800
Subject: [PATCH] Changes
---
mes-basic/src/main/java/com/chinaztt/mes/basic/mapper/DivisionMapper.java | 3 -
mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PostController.java | 8 ++++
mes-basic/src/main/java/com/chinaztt/mes/basic/controller/DivisionController.java | 12 +++++-
mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Division.java | 5 --
mes-basic/src/main/resources/mapper/DivisionMapper.xml | 2 +
mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Staff.java | 25 +++++++++++-
mes-basic/src/main/resources/mapper/PostMapper.xml | 6 +++
mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Post.java | 21 +++++++++-
mes-basic/src/main/resources/mapper/StaffMapper.xml | 7 +++
9 files changed, 75 insertions(+), 14 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/DivisionController.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/DivisionController.java
index c545860..3105705 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/DivisionController.java
+++ b/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));
+ }
+
}
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PostController.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PostController.java
index f48baa4..09f4c4d 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PostController.java
+++ b/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));
+ }
+
}
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Division.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Division.java
index 827f2cf..2f34a0b 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Division.java
+++ b/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;
}
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Post.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Post.java
index 78c5fe8..5e4ae7d 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Post.java
+++ b/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;
}
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Staff.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Staff.java
index c5e12aa..53db637 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Staff.java
+++ b/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;
}
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/mapper/DivisionMapper.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/mapper/DivisionMapper.java
index da1f966..d86a5f4 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/mapper/DivisionMapper.java
+++ b/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);
}
diff --git a/mes-basic/src/main/resources/mapper/DivisionMapper.xml b/mes-basic/src/main/resources/mapper/DivisionMapper.xml
index 7248693..1f6bee8 100644
--- a/mes-basic/src/main/resources/mapper/DivisionMapper.xml
+++ b/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"/>
diff --git a/mes-basic/src/main/resources/mapper/PostMapper.xml b/mes-basic/src/main/resources/mapper/PostMapper.xml
index 8e19e29..e733926 100644
--- a/mes-basic/src/main/resources/mapper/PostMapper.xml
+++ b/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>
diff --git a/mes-basic/src/main/resources/mapper/StaffMapper.xml b/mes-basic/src/main/resources/mapper/StaffMapper.xml
index ef5e413..e7a7b0f 100644
--- a/mes-basic/src/main/resources/mapper/StaffMapper.xml
+++ b/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
--
Gitblit v1.9.3