From b8045b11ca8af95cb5aeba464bff589e0b9f53b8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 30 五月 2024 18:08:13 +0800
Subject: [PATCH] 光纤配置三层架构+辅助工时的审核与批准逻辑修改
---
performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java | 6
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java | 20 ++
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsBushingMapper.java | 16 +
inspect-server/src/main/java/com/yuanchu/mom/controller/InsFiberController.java | 22 ++
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFiber.java | 71 +++++++
inspect-server/src/main/java/com/yuanchu/mom/controller/InsBushingController.java | 22 ++
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsFiberMapper.java | 16 +
inspect-server/src/main/resources/mapper/InsBushingMapper.xml | 18 +
performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java | 6
inspect-server/src/main/java/com/yuanchu/mom/service/InsFibersService.java | 16 +
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsBushing.java | 61 ++++++
inspect-server/src/main/resources/mapper/InsFiberMapper.xml | 21 ++
inspect-server/src/main/java/com/yuanchu/mom/controller/InsFibersController.java | 22 ++
inspect-server/src/main/java/com/yuanchu/mom/service/InsFiberService.java | 16 +
performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java | 62 +++---
inspect-server/src/main/resources/mapper/InsFibersMapper.xml | 20 ++
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFibers.java | 68 ++++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsFibersServiceImpl.java | 20 ++
inspect-server/src/main/java/com/yuanchu/mom/service/InsBushingService.java | 16 +
system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java | 2
performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursDayService.java | 2
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsFibersMapper.java | 16 +
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsFiberServiceImpl.java | 20 ++
23 files changed, 516 insertions(+), 43 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsBushingController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsBushingController.java
new file mode 100644
index 0000000..c588596
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsBushingController.java
@@ -0,0 +1,22 @@
+package com.yuanchu.mom.controller;
+
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍏夌氦閰嶇疆鐨勫绠¤〃 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-05-30 05:58:16
+ */
+@Api(tags = "妫�楠屼笅鍗�-鍏夌氦閰嶇疆-濂楃")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/insBushing")
+public class InsBushingController {
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsFiberController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsFiberController.java
new file mode 100644
index 0000000..13713f7
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsFiberController.java
@@ -0,0 +1,22 @@
+package com.yuanchu.mom.controller;
+
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍏夌氦閰嶇疆鐨勫厜绾よ〃 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-05-30 05:59:01
+ */
+@Api(tags = "妫�楠屼笅鍗�-鍏夌氦閰嶇疆-鍏夌氦琛�")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/insFiber")
+public class InsFiberController {
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsFibersController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsFibersController.java
new file mode 100644
index 0000000..f8accf9
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsFibersController.java
@@ -0,0 +1,22 @@
+package com.yuanchu.mom.controller;
+
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍏夌氦閰嶇疆鐨勫厜绾ゅ甫琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-05-30 05:59:13
+ */
+@Api(tags = "妫�楠屼笅鍗�-鍏夌氦閰嶇疆-鍏夌氦甯﹁〃")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/insFibers")
+public class InsFibersController {
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsBushingMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsBushingMapper.java
new file mode 100644
index 0000000..e80ded3
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsBushingMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.mapper;
+
+import com.yuanchu.mom.pojo.InsBushing;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 鍏夌氦閰嶇疆鐨勫绠¤〃 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-05-30 05:58:16
+ */
+public interface InsBushingMapper extends BaseMapper<InsBushing> {
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsFiberMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsFiberMapper.java
new file mode 100644
index 0000000..b772490
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsFiberMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.mapper;
+
+import com.yuanchu.mom.pojo.InsFiber;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 鍏夌氦閰嶇疆鐨勫厜绾よ〃 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-05-30 05:59:01
+ */
+public interface InsFiberMapper extends BaseMapper<InsFiber> {
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsFibersMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsFibersMapper.java
new file mode 100644
index 0000000..61c3e85
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsFibersMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.mapper;
+
+import com.yuanchu.mom.pojo.InsFibers;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 鍏夌氦閰嶇疆鐨勫厜绾ゅ甫琛� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-05-30 05:59:13
+ */
+public interface InsFibersMapper extends BaseMapper<InsFibers> {
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsBushing.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsBushing.java
new file mode 100644
index 0000000..ae52f9c
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsBushing.java
@@ -0,0 +1,61 @@
+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 lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 鍏夌氦閰嶇疆鐨勫绠¤〃
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-05-30 05:58:16
+ */
+@Getter
+@Setter
+@TableName("ins_bushing")
+@ApiModel(value = "InsBushing瀵硅薄", description = "鍏夌氦閰嶇疆鐨勫绠¤〃")
+public class InsBushing extends OrderBy implements Serializable {
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("绠¤壊鏍�")
+ @ValueTableShow(2)
+ private String color;
+
+ @ApiModelProperty("鏍囬噺")
+ @ValueTableShow(3)
+ private Integer standNum;
+
+ @ApiModelProperty("娴嬭瘯閲�")
+ @ValueTableShow(4)
+ private Integer testNum;
+
+ @ApiModelProperty("鍏宠仈 鏍峰搧id")
+ private Integer insSampleId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFiber.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFiber.java
new file mode 100644
index 0000000..7659b81
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFiber.java
@@ -0,0 +1,71 @@
+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 lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 鍏夌氦閰嶇疆鐨勫厜绾よ〃
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-05-30 05:59:01
+ */
+@Getter
+@Setter
+@TableName("ins_fiber")
+@ApiModel(value = "InsFiber瀵硅薄", description = "鍏夌氦閰嶇疆鐨勫厜绾よ〃")
+public class InsFiber extends OrderBy implements Serializable {
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("绠″鑹叉爣")
+ @ValueTableShow(2)
+ private String bushColor;
+
+ @ApiModelProperty("鍏夌氦鑹叉爣")
+ @ValueTableShow(3)
+ private String color;
+
+ @ApiModelProperty("鍏夌氦瑙勬牸")
+ @ValueTableShow(4)
+ private String model;
+
+ @ApiModelProperty("鍙傝�冩爣鍑�")
+ @ValueTableShow(5)
+ private String standard;
+
+ @ApiModelProperty("鍏宠仈 妫�娴嬮」鐩甶d")
+ private Integer insProductId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("鍏宠仈 濂楃琛╥d")
+ private Integer insBushingId;
+
+ @ApiModelProperty("鍏宠仈 鍏夌氦甯﹁〃id")
+ private Integer insFibersId;
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFibers.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFibers.java
new file mode 100644
index 0000000..6354a8e
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFibers.java
@@ -0,0 +1,68 @@
+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 lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 鍏夌氦閰嶇疆鐨勫厜绾ゅ甫琛�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-05-30 05:59:13
+ */
+@Getter
+@Setter
+@TableName("ins_fibers")
+@ApiModel(value = "InsFibers瀵硅薄", description = "鍏夌氦閰嶇疆鐨勫厜绾ゅ甫琛�")
+public class InsFibers extends OrderBy implements Serializable {
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("鍏夌氦甯︾紪鍙�")
+ @ValueTableShow(2)
+ private String code;
+
+ @ApiModelProperty("鍏夌氦甯﹁鏍�")
+ @ValueTableShow(3)
+ private String model;
+
+ @ApiModelProperty("鍙傝�冩爣鍑�")
+ @ValueTableShow(4)
+ private String standard;
+
+ @ApiModelProperty("鍏夌氦妫�娴嬮噺")
+ @ValueTableShow(5)
+ private String num;
+
+ @ApiModelProperty("鍏宠仈 妫�娴嬮」鐩甶d")
+ private Integer insProductId;
+
+ @ApiModelProperty("鍏宠仈 濂楃琛╥d")
+ private Integer insBushingId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsBushingService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsBushingService.java
new file mode 100644
index 0000000..a30d7e6
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsBushingService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.service;
+
+import com.yuanchu.mom.pojo.InsBushing;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鍏夌氦閰嶇疆鐨勫绠¤〃 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-05-30 05:58:16
+ */
+public interface InsBushingService extends IService<InsBushing> {
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsFiberService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsFiberService.java
new file mode 100644
index 0000000..7c713c7
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsFiberService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.service;
+
+import com.yuanchu.mom.pojo.InsFiber;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鍏夌氦閰嶇疆鐨勫厜绾よ〃 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-05-30 05:59:01
+ */
+public interface InsFiberService extends IService<InsFiber> {
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsFibersService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsFibersService.java
new file mode 100644
index 0000000..b369ff1
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsFibersService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.service;
+
+import com.yuanchu.mom.pojo.InsFibers;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鍏夌氦閰嶇疆鐨勫厜绾ゅ甫琛� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-05-30 05:59:13
+ */
+public interface InsFibersService extends IService<InsFibers> {
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java
new file mode 100644
index 0000000..5edb2c7
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.mom.service.impl;
+
+import com.yuanchu.mom.pojo.InsBushing;
+import com.yuanchu.mom.mapper.InsBushingMapper;
+import com.yuanchu.mom.service.InsBushingService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鍏夌氦閰嶇疆鐨勫绠¤〃 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-05-30 05:58:16
+ */
+@Service
+public class InsBushingServiceImpl extends ServiceImpl<InsBushingMapper, InsBushing> implements InsBushingService {
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsFiberServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsFiberServiceImpl.java
new file mode 100644
index 0000000..edc0e58
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsFiberServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.mom.service.impl;
+
+import com.yuanchu.mom.pojo.InsFiber;
+import com.yuanchu.mom.mapper.InsFiberMapper;
+import com.yuanchu.mom.service.InsFiberService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鍏夌氦閰嶇疆鐨勫厜绾よ〃 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-05-30 05:59:01
+ */
+@Service
+public class InsFiberServiceImpl extends ServiceImpl<InsFiberMapper, InsFiber> implements InsFiberService {
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsFibersServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsFibersServiceImpl.java
new file mode 100644
index 0000000..fb0cd85
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsFibersServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.mom.service.impl;
+
+import com.yuanchu.mom.pojo.InsFibers;
+import com.yuanchu.mom.mapper.InsFibersMapper;
+import com.yuanchu.mom.service.InsFibersService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鍏夌氦閰嶇疆鐨勫厜绾ゅ甫琛� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2024-05-30 05:59:13
+ */
+@Service
+public class InsFibersServiceImpl extends ServiceImpl<InsFibersMapper, InsFibers> implements InsFibersService {
+
+}
diff --git a/inspect-server/src/main/resources/mapper/InsBushingMapper.xml b/inspect-server/src/main/resources/mapper/InsBushingMapper.xml
new file mode 100644
index 0000000..ef37a0c
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/InsBushingMapper.xml
@@ -0,0 +1,18 @@
+<?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.InsBushingMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsBushing">
+ <id column="id" property="id" />
+ <result column="color" property="color" />
+ <result column="stand_num" property="standNum" />
+ <result column="test_num" property="testNum" />
+ <result column="ins_sample_id" property="insSampleId" />
+ <result column="create_user" property="createUser" />
+ <result column="create_time" property="createTime" />
+ <result column="update_user" property="updateUser" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/inspect-server/src/main/resources/mapper/InsFiberMapper.xml b/inspect-server/src/main/resources/mapper/InsFiberMapper.xml
new file mode 100644
index 0000000..f1e9676
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/InsFiberMapper.xml
@@ -0,0 +1,21 @@
+<?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.InsFiberMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsFiber">
+ <id column="id" property="id" />
+ <result column="bush_color" property="bushColor" />
+ <result column="color" property="color" />
+ <result column="model" property="model" />
+ <result column="standard" property="standard" />
+ <result column="ins_product_id" property="insProductId" />
+ <result column="create_user" property="createUser" />
+ <result column="create_time" property="createTime" />
+ <result column="update_user" property="updateUser" />
+ <result column="update_time" property="updateTime" />
+ <result column="ins_bushing_id" property="insBushingId" />
+ <result column="ins_fibers_id" property="insFibersId" />
+ </resultMap>
+
+</mapper>
diff --git a/inspect-server/src/main/resources/mapper/InsFibersMapper.xml b/inspect-server/src/main/resources/mapper/InsFibersMapper.xml
new file mode 100644
index 0000000..59a15bd
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/InsFibersMapper.xml
@@ -0,0 +1,20 @@
+<?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.InsFibersMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsFibers">
+ <id column="id" property="id" />
+ <result column="code" property="code" />
+ <result column="model" property="model" />
+ <result column="standard" property="standard" />
+ <result column="num" property="num" />
+ <result column="ins_product_id" property="insProductId" />
+ <result column="ins_bushing_id" property="insBushingId" />
+ <result column="create_user" property="createUser" />
+ <result column="create_time" property="createTime" />
+ <result column="update_user" property="updateUser" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java
index 471e07f..eb43450 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java
@@ -72,15 +72,15 @@
@ValueClassify("宸ユ椂绠＄悊")
@ApiOperation(value = "鎵瑰噯")
@PostMapping("/approve")
- public Result approve(Integer id, String state) {
- return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(id,state));
+ public Result approve(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
+ return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(auxiliaryWorkingHoursDay));
}
@ValueClassify("宸ユ椂绠＄悊")
@ApiOperation(value = "瀹℃牳")
@PostMapping("/check")
public Result check(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay ) {
- return Result.success(auxiliaryWorkingHoursDayService.updateAuxiliaryWorkingHoursDay(auxiliaryWorkingHoursDay));
+ return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(auxiliaryWorkingHoursDay));
}
@ValueClassify("宸ユ椂绠＄悊")
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursDayService.java b/performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursDayService.java
index 7c5804e..86669a0 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursDayService.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/AuxiliaryWorkingHoursDayService.java
@@ -25,7 +25,7 @@
AuxiliaryWorkingHoursDay selectAuxiliaryWorkingHoursByNumber(String number);
- int checkOrApprove(Integer id, String state);
+ int checkOrApprove(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay);
int updateAuxiliaryWorkingHoursDay(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay);
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java
index 891c9ef..8b9fb60 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java
@@ -186,14 +186,8 @@
//鏌ヨ杈呭姪宸ユ椂
auxiliaryWorkingHoursDayDtos = auxiliaryWorkingHoursDayMapper.selectDataByUser(ids);
-// if (auxiliaryWorkingHoursDayDtos == null || auxiliaryWorkingHoursDayDtos.size() == 0) {
-// throw new RuntimeException("鏆傛棤鏁版嵁");
-// }
//鏌ヨ缁熻宸ユ椂
auxiliaryOutputWorkingHoursDtos = auxiliaryOutputWorkingHoursMapper.selectDataByUser(ids);
-// if (auxiliaryOutputWorkingHoursDtos == null || auxiliaryOutputWorkingHoursDtos.size() == 0) {
-// throw new RuntimeException("鏆傛棤鏁版嵁");
-// }
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("UTF-8");
// 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java
index 954addc..6350272 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java
@@ -61,30 +61,30 @@
String week = auxiliaryWorkingHoursDayDto.getWeek();
auxiliaryWorkingHoursDayDto.setDateTime(null);
auxiliaryWorkingHoursDayDto.setWeek(null);
- Map<String, Object> map = new HashMap<>();
- List<Integer> ids = null;
- map.put("head", PrintChina.printChina(AuxiliaryWorkingHoursDayDto.class));
- //鍒ゆ柇缁勯暱,缁勫憳,绠＄悊鍛樻潈闄�
- Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryWorkingHoursDay");
- User user = userMapper.selectById(map1.get("userId"));
- Integer roleId = user.getRoleId();
- Power power = powerMapper.selectOne(Wrappers.<Power>lambdaQuery().eq(Power::getRoleId, roleId).eq(Power::getMenuMethod, "leader"));
- if (ObjectUtils.isEmpty(power)) {
- //涓嶆槸缁勯暱
- if (map1.get("look") == 1) {
- //鏄粍鍛�
- auxiliaryWorkingHoursDayDto.setNameUser(map1.get("userId"));
- } else {
- //绠＄悊鍛�(涓嶆坊鍔犻檺鍒舵潯浠舵墍鏈変汉閮藉彲浠ョ湅)
- }
+ Map<String, Object> map = new HashMap<>();
+ List<Integer> ids = null;
+ map.put("head", PrintChina.printChina(AuxiliaryWorkingHoursDayDto.class));
+ //鍒ゆ柇缁勯暱,缁勫憳,绠＄悊鍛樻潈闄�
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryWorkingHoursDay");
+ User user = userMapper.selectById(map1.get("userId"));
+ Integer roleId = user.getRoleId();
+ Power power = powerMapper.selectOne(Wrappers.<Power>lambdaQuery().eq(Power::getRoleId, roleId).eq(Power::getMenuMethod, "leader"));
+ if (ObjectUtils.isEmpty(power)) {
+ //涓嶆槸缁勯暱
+ if (map1.get("look") == 1) {
+ //鏄粍鍛�
+ auxiliaryWorkingHoursDayDto.setNameUser(map1.get("userId"));
} else {
- //鏄粍闀�
- //鏌ヨ缁勫憳
- List<User> users = userMapper.selectList(Wrappers.<User>lambdaQuery().like(User::getDepartLimsId, user.getDepartLimsId()));
- if (ObjectUtils.isNotEmpty(users)) {
- ids = users.stream().map(User::getId).distinct().collect(Collectors.toList());
- }
+ //绠＄悊鍛�(涓嶆坊鍔犻檺鍒舵潯浠舵墍鏈変汉閮藉彲浠ョ湅)
}
+ } else {
+ //鏄粍闀�
+ //鏌ヨ缁勫憳
+ List<User> users = userMapper.selectList(Wrappers.<User>lambdaQuery().like(User::getDepartLimsId, user.getDepartLimsId()));
+ if (ObjectUtils.isNotEmpty(users)) {
+ ids = users.stream().map(User::getId).distinct().collect(Collectors.toList());
+ }
+ }
if (ObjectUtils.isNotEmpty(dates)) {
String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
if (ObjectUtils.isNotEmpty(week)) {
@@ -92,12 +92,11 @@
map.put("body", auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page,
QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto)
.ge("date_time", split[0]).le("date_time", split[1] + " 23:59:59")
- .ge("week", weeks[0]).le("week", weeks[1] ), ids));
+ .ge("week", weeks[0]).le("week", weeks[1]), ids));
} else {
map.put("body", auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page, QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto).ge("date_time", split[0]).le("date_time", split[1] + " 23:59:59"), ids));
}
- }
- else {
+ } else {
map.put("body", auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page, QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto), ids));
}
return map;
@@ -127,18 +126,17 @@
//瀹℃牳/鎵瑰噯
@Override
- public int checkOrApprove(Integer id, String state) {
- AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay = auxiliaryWorkingHoursDayMapper.selectById(id);
- auxiliaryWorkingHoursDay.setState(state);
+ public int checkOrApprove(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
+ if (auxiliaryWorkingHoursDay.getState().equals("宸插鏍�")) {
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ auxiliaryWorkingHoursDay.setReviewer(userMapper.selectById(userId).getName());
+ }
return auxiliaryWorkingHoursDayMapper.updateById(auxiliaryWorkingHoursDay);
}
//缂栬緫
@Override
public int updateAuxiliaryWorkingHoursDay(AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
- if (!auxiliaryWorkingHoursDay.getState().equals("宸叉彁浜�")) {
- throw new RuntimeException("璇ユ暟鎹凡缁忔壒鍑嗘垨宸插鏍�,鏃犳硶杩涜缂栬緫!");
- }
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
auxiliaryWorkingHoursDay.setNameUser(userId);//濮撳悕id
return auxiliaryWorkingHoursDayMapper.updateById(auxiliaryWorkingHoursDay);
@@ -156,7 +154,7 @@
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
PerformanceShift performanceShift = performanceShiftMapper.selectOne(Wrappers.<PerformanceShift>lambdaQuery().eq(PerformanceShift::getUserId, userId).eq(PerformanceShift::getWorkTime, dateTime));
if (ObjectUtils.isEmpty(performanceShift)) {
- return null;
+ return null;
}
return performanceShift.getShift();
}
diff --git a/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java b/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
index d6c63d8..6bb30e0 100644
--- a/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
+++ b/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
@@ -20,7 +20,7 @@
public static String database_username = "root";
public static String database_password= "123456";
public static String author = "姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃";
- public static String model_name = "/performance-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
+ public static String model_name = "/inspect-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
public static String setParent = "com.yuanchu.mom"; // 鍖呰矾寰�
public static void main(String[] args) {
String projectPath = System.getProperty("user.dir");
--
Gitblit v1.9.3