From 83d43612df0238902ee1506c69e1fcc12f10a16e Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期一, 17 六月 2024 13:48:10 +0800 Subject: [PATCH] 新增模板编号+检验项目参数排序+考评模块建表 --- performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateCompetentController.java | 20 + performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateLeaderServiceImpl.java | 20 + performance-server/src/main/resources/mapper/EvaluateLeaderMapper.xml | 22 + performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateGroupServiceImpl.java | 20 + performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateServiceImpl.java | 20 + performance-server/src/main/java/com/yuanchu/mom/pojo/EvaluateLeader.java | 81 +++++ inspect-server/src/main/resources/mapper/StandardTemplateMapper.xml | 2 performance-server/src/main/java/com/yuanchu/mom/mapper/EvaluateMapper.java | 16 + performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateGroupController.java | 19 + inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardTemplate.java | 19 performance-server/src/main/java/com/yuanchu/mom/service/EvaluateService.java | 16 + performance-server/src/main/java/com/yuanchu/mom/mapper/EvaluateGroupMapper.java | 16 + performance-server/src/main/java/com/yuanchu/mom/mapper/EvaluateLeaderMapper.java | 16 + performance-server/src/main/java/com/yuanchu/mom/service/EvaluateLeaderService.java | 16 + performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateCompetentServiceImpl.java | 20 + performance-server/src/main/java/com/yuanchu/mom/mapper/EvaluateCompetentMapper.java | 16 + performance-server/src/main/resources/mapper/EvaluateGroupMapper.xml | 23 + performance-server/src/main/java/com/yuanchu/mom/service/EvaluateGroupService.java | 16 + performance-server/src/main/java/com/yuanchu/mom/service/EvaluateCompetentService.java | 16 + performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateController.java | 20 + cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 44 ++ performance-server/src/main/resources/mapper/EvaluateMapper.xml | 14 + performance-server/src/main/java/com/yuanchu/mom/pojo/EvaluateCompetent.java | 86 ++++++ performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateLeaderController.java | 19 + performance-server/src/main/resources/mapper/AuxiliaryCorrectionHoursMapper.xml | 83 +++-- performance-server/src/main/java/com/yuanchu/mom/pojo/Evaluate.java | 64 ++++ performance-server/src/main/java/com/yuanchu/mom/pojo/EvaluateGroup.java | 86 ++++++ system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java | 2 performance-server/src/main/resources/mapper/EvaluateCompetentMapper.xml | 23 + 29 files changed, 773 insertions(+), 62 deletions(-) diff --git a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml index def7e4c..655974d 100644 --- a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml +++ b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml @@ -7,7 +7,7 @@ delete from structure_item_parameter where sample like concat('%',#{sample},'%') </delete> <select id="selectItemParameterList" resultType="com.yuanchu.mom.pojo.StructureItemParameter"> - select id, + select * from (select A.id, inspection_item, inspection_item_en, inspection_item_subclass, @@ -20,10 +20,10 @@ inspection_item_type, checkout_number, section, - create_user, - update_user, - create_time, - update_time, + A.create_user, + A.update_user, + A.create_time, + A.update_time, method, man_day, bsm, @@ -35,11 +35,26 @@ ask, ask_tell, inspection_item_class, - inspection_item_class_en - from structure_item_parameter + inspection_item_class_en, + code + from (select *, + CASE + WHEN INSTR(sample, ',') > 0 THEN + SUBSTRING_INDEX(SUBSTRING_INDEX(sample, '","', 1), '"', -1) + when sample = '[""]' then null + ELSE + TRIM(BOTH '["]' FROM SUBSTRING_INDEX(REPLACE(sample, '[["', ''), '"]]', 1)) + END AS samples + from structure_item_parameter) A + left join structure_test_object sto on samples = specimen_name <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''"> ${ew.customSqlSegment} - </if> + </if>)B + order by CASE + WHEN code IS NULL THEN 1 + ELSE 0 + END, + CAST(code AS UNSIGNED) asc </select> <resultMap id="getInsProductions" type="map"> @@ -51,14 +66,17 @@ <result property="name" column="subclass"/> </resultMap> <select id="getInsProduction" resultMap="getInsProductions"> - select id, inspection_item, - case when inspection_item_subclass='' then inspection_item - else inspection_item_subclass end as subclass + select id, + inspection_item, + case + when inspection_item_subclass = '' then inspection_item + else inspection_item_subclass end as subclass from structure_item_parameter </select> <select id="getItemTree" resultMap="itemDto"> - select sto.id sId,sto.specimen_name sName,p.id pId,p.name pName from structure_test_object sto - left join product p on p.object_id = sto.id + select sto.id sId, sto.specimen_name sName, p.id pId, p.name pName + from structure_test_object sto + left join product p on p.object_id = sto.id </select> <resultMap id="itemDto" type="com.yuanchu.mom.dto.TestItemDto"> diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardTemplate.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardTemplate.java index 1314ce1..2fe6315 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardTemplate.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardTemplate.java @@ -29,14 +29,14 @@ * 妯℃澘鍚嶇О */ @ApiModelProperty("妯℃澘鍚嶇О") - @ValueTableShow(1) + @ValueTableShow(2) private String name; /** * 澶囨敞 */ @ApiModelProperty("澶囨敞") - @ValueTableShow(2) + @ValueTableShow(3) private String remark; /** @@ -52,7 +52,7 @@ @ApiModelProperty("鍒涘缓鏃堕棿") @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ValueTableShow(4) + @ValueTableShow(5) private LocalDateTime createTime; /** * @@ -65,16 +65,23 @@ @ApiModelProperty("淇敼鏃堕棿") @TableField(fill = FieldFill.INSERT_UPDATE) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ValueTableShow(6) + @ValueTableShow(7) private LocalDateTime updateTime; @ApiModelProperty("鍒涘缓鐢ㄦ埛") - @ValueTableShow(3) + @ValueTableShow(4) @TableField(exist = false) private String createUserName; @ApiModelProperty("鏇存柊鐢ㄦ埛") - @ValueTableShow(5) + @ValueTableShow(6) @TableField(exist = false) private String updateUserName; + + /** + * 妯℃澘缂栧彿 + */ + @ApiModelProperty("妯℃澘缂栧彿") + @ValueTableShow(1) + private String number; } \ No newline at end of file diff --git a/inspect-server/src/main/resources/mapper/StandardTemplateMapper.xml b/inspect-server/src/main/resources/mapper/StandardTemplateMapper.xml index e3042fb..68e8ffb 100644 --- a/inspect-server/src/main/resources/mapper/StandardTemplateMapper.xml +++ b/inspect-server/src/main/resources/mapper/StandardTemplateMapper.xml @@ -17,7 +17,7 @@ <select id="selectStandardTemplatePageList" resultType="com.yuanchu.mom.pojo.StandardTemplate"> select * from ( - select st.id, st.name, remark, u2.name create_user_name, u3.name update_user_name, st.create_time, st.update_time + select st.id, st.name,st.number, remark, u2.name create_user_name, u3.name update_user_name, st.create_time, st.update_time from standard_template st left join user u2 on u2.id = st.create_user left join user u3 on u3.id = st.update_user diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateCompetentController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateCompetentController.java new file mode 100644 index 0000000..e1e453f --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateCompetentController.java @@ -0,0 +1,20 @@ +package com.yuanchu.mom.controller; + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * <p> + * 涓荤鎵撳垎 鍓嶇鎺у埗鍣� + * </p> + * + * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 + * @since 2024-06-17 01:39:36 + */ +@Api(tags = "缁╂晥绠$悊-浜哄憳鑰冭瘎") +@RestController +@RequestMapping("/evaluateCompetent") +public class EvaluateCompetentController { + +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateController.java new file mode 100644 index 0000000..5815d15 --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateController.java @@ -0,0 +1,20 @@ +package com.yuanchu.mom.controller; + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * <p> + * 浜哄憳鑰冭瘎 鍓嶇鎺у埗鍣� + * </p> + * + * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 + * @since 2024-06-17 01:32:45 + */ +@Api(tags = "缁╂晥绠$悊-浜哄憳鑰冭瘎") +@RestController +@RequestMapping("/evaluate") +public class EvaluateController { + +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateGroupController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateGroupController.java new file mode 100644 index 0000000..df80c5c --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateGroupController.java @@ -0,0 +1,19 @@ +package com.yuanchu.mom.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * <p> + * 鍛樺伐浜掕瘎琛� 鍓嶇鎺у埗鍣� + * </p> + * + * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 + * @since 2024-06-17 01:39:45 + */ +@Api(tags = "缁╂晥绠$悊-浜哄憳鑰冭瘎") +@RestController +@RequestMapping("/evaluateGroup") +public class EvaluateGroupController { + +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateLeaderController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateLeaderController.java new file mode 100644 index 0000000..bd084dd --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateLeaderController.java @@ -0,0 +1,19 @@ +package com.yuanchu.mom.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * <p> + * 缁勯暱鎵撳垎 鍓嶇鎺у埗鍣� + * </p> + * + * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 + * @since 2024-06-17 01:39:56 + */ +@Api(tags = "缁╂晥绠$悊-浜哄憳鑰冭瘎") +@RestController +@RequestMapping("/evaluateLeader") +public class EvaluateLeaderController { + +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/mapper/EvaluateCompetentMapper.java b/performance-server/src/main/java/com/yuanchu/mom/mapper/EvaluateCompetentMapper.java new file mode 100644 index 0000000..244d9a2 --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/mapper/EvaluateCompetentMapper.java @@ -0,0 +1,16 @@ +package com.yuanchu.mom.mapper; + +import com.yuanchu.mom.pojo.EvaluateCompetent; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * <p> + * 涓荤鎵撳垎 Mapper 鎺ュ彛 + * </p> + * + * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 + * @since 2024-06-17 01:39:36 + */ +public interface EvaluateCompetentMapper extends BaseMapper<EvaluateCompetent> { + +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/mapper/EvaluateGroupMapper.java b/performance-server/src/main/java/com/yuanchu/mom/mapper/EvaluateGroupMapper.java new file mode 100644 index 0000000..324a88d --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/mapper/EvaluateGroupMapper.java @@ -0,0 +1,16 @@ +package com.yuanchu.mom.mapper; + +import com.yuanchu.mom.pojo.EvaluateGroup; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * <p> + * 鍛樺伐浜掕瘎琛� Mapper 鎺ュ彛 + * </p> + * + * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 + * @since 2024-06-17 01:39:45 + */ +public interface EvaluateGroupMapper extends BaseMapper<EvaluateGroup> { + +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/mapper/EvaluateLeaderMapper.java b/performance-server/src/main/java/com/yuanchu/mom/mapper/EvaluateLeaderMapper.java new file mode 100644 index 0000000..b3c5739 --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/mapper/EvaluateLeaderMapper.java @@ -0,0 +1,16 @@ +package com.yuanchu.mom.mapper; + +import com.yuanchu.mom.pojo.EvaluateLeader; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * <p> + * 缁勯暱鎵撳垎 Mapper 鎺ュ彛 + * </p> + * + * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 + * @since 2024-06-17 01:39:56 + */ +public interface EvaluateLeaderMapper extends BaseMapper<EvaluateLeader> { + +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/mapper/EvaluateMapper.java b/performance-server/src/main/java/com/yuanchu/mom/mapper/EvaluateMapper.java new file mode 100644 index 0000000..b9423a0 --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/mapper/EvaluateMapper.java @@ -0,0 +1,16 @@ +package com.yuanchu.mom.mapper; + +import com.yuanchu.mom.pojo.Evaluate; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * <p> + * 浜哄憳鑰冭瘎 Mapper 鎺ュ彛 + * </p> + * + * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 + * @since 2024-06-17 01:32:45 + */ +public interface EvaluateMapper extends BaseMapper<Evaluate> { + +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/pojo/Evaluate.java b/performance-server/src/main/java/com/yuanchu/mom/pojo/Evaluate.java new file mode 100644 index 0000000..6a9f0fe --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/pojo/Evaluate.java @@ -0,0 +1,64 @@ +package com.yuanchu.mom.pojo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; + +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-06-17 01:32:45 + */ +@Getter +@Setter +@ApiModel(value = "Evaluate瀵硅薄", description = "浜哄憳鑰冭瘎") +public class Evaluate extends OrderBy implements Serializable { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty("澶栭敭 鍏宠仈鐢ㄦ埛id") + private Integer userId; + + @ValueTableShow(value = 1, name = "宸ュ彿") + @TableField(exist = false,select = false) + private String account; + + @ValueTableShow(value = 2, name = "濮撳悕") + @TableField(exist = false,select = false) + private String name; + + @ValueTableShow(value = 3, name = "鍛樺伐浜掕瘎") + @TableField(exist = false,select = false) + private Double groupTotal; + + @ValueTableShow(value = 4, name = "缁勯暱璇勫垎") + @TableField(exist = false,select = false) + private Double leaderTotal; + + @ValueTableShow(value = 5, name = "涓荤璇勫垎") + @TableField(exist = false,select = false) + private Double competentTotal; + + @ApiModelProperty("鑰冭瘎寰楀垎") + @ValueTableShow(6) + private Double score; + + @ApiModelProperty("鑰冭瘎绛夌骇") + @ValueTableShow(7) + private String grade; + + @ApiModelProperty("鏈堜唤") + private String month; +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/pojo/EvaluateCompetent.java b/performance-server/src/main/java/com/yuanchu/mom/pojo/EvaluateCompetent.java new file mode 100644 index 0000000..6b681ea --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/pojo/EvaluateCompetent.java @@ -0,0 +1,86 @@ +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-06-17 01:39:36 + */ +@Getter +@Setter +@TableName("evaluate_competent") +@ApiModel(value = "EvaluateCompetent瀵硅薄", description = "涓荤鎵撳垎") +public class EvaluateCompetent extends OrderBy implements Serializable { + + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty("澶栭敭 鍏宠仈浜哄憳鑰冭瘎琛╥d") + private Integer evaluateId; + + @ValueTableShow(value = 1, name = "濮撳悕") + @TableField(exist = false,select = false) + private String name; + + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + @TableField(fill = FieldFill.INSERT) + private Integer createUser; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private Integer updateUser; + + @ApiModelProperty("鎶�鑳芥按骞�") + @ValueTableShow(2) + private Double skill; + + @ApiModelProperty("鏈嶄粠鍒嗗伐") + @ValueTableShow(3) + private Double compliance; + + @ApiModelProperty("绉瀬鎬�") + @ValueTableShow(4) + private Double positive; + + @ApiModelProperty("5S-3瀹�") + @ValueTableShow(5) + private Double tidy; + + @ApiModelProperty("瑙勭珷鍒跺害") + @ValueTableShow(6) + private Double discipline; + + @ApiModelProperty("鍥㈢粨鍗忎綔") + @ValueTableShow(7) + private Double solidarity; + + @ApiModelProperty("鎻愭绉垎") + @ValueTableShow(8) + private Double proposal; + + @ApiModelProperty("寰楀垎") + @ValueTableShow(9) + private Double total; +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/pojo/EvaluateGroup.java b/performance-server/src/main/java/com/yuanchu/mom/pojo/EvaluateGroup.java new file mode 100644 index 0000000..6c672a8 --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/pojo/EvaluateGroup.java @@ -0,0 +1,86 @@ +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-06-17 01:39:45 + */ +@Getter +@Setter +@TableName("evaluate_group") +@ApiModel(value = "EvaluateGroup瀵硅薄", description = "鍛樺伐浜掕瘎琛�") +public class EvaluateGroup extends OrderBy implements Serializable { + + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty("澶栭敭 鍏宠仈浜哄憳鑰冭瘎琛╥d") + private Integer evaluateId; + + @ValueTableShow(value = 1, name = "濮撳悕") + @TableField(exist = false,select = false) + private String name; + + @ApiModelProperty("鍙婃椂鎬�") + @ValueTableShow(2) + private Double seasonable; + + @ApiModelProperty("鍑嗙‘鎬�") + @ValueTableShow(3) + private Double exact; + + @ApiModelProperty("鎿嶄綔鎶�鑳�") + @ValueTableShow(4) + private Double skill; + + @ApiModelProperty("璁惧缁存姢") + @ValueTableShow(5) + private Double preserve; + + @ApiModelProperty("閬电珷瀹堢邯") + @ValueTableShow(6) + private Double discipline; + + @ApiModelProperty("鍥㈢粨鍗忎綔") + @ValueTableShow(7) + private Double solidarity; + + @ApiModelProperty("5S-3瀹�") + @ValueTableShow(8) + private Double tidy; + + @ApiModelProperty("寰楀垎") + @ValueTableShow(9) + private Double total; + + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + @TableField(fill = FieldFill.INSERT) + private Integer createUser; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private Integer updateUser; +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/pojo/EvaluateLeader.java b/performance-server/src/main/java/com/yuanchu/mom/pojo/EvaluateLeader.java new file mode 100644 index 0000000..7d278cc --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/pojo/EvaluateLeader.java @@ -0,0 +1,81 @@ +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-06-17 01:39:56 + */ +@Getter +@Setter +@TableName("evaluate_leader") +@ApiModel(value = "EvaluateLeader瀵硅薄", description = "缁勯暱鎵撳垎") +public class EvaluateLeader extends OrderBy implements Serializable { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty("澶栭敭 鍏宠仈浜哄憳鑰冭瘎琛╥d") + private Integer evaluateId; + + @ValueTableShow(value = 1, name = "濮撳悕") + @TableField(exist = false,select = false) + private String name; + + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + @TableField(fill = FieldFill.INSERT) + private Integer createUser; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private Integer updateUser; + + @ApiModelProperty("宸ヤ綔璐d换蹇�") + @ValueTableShow(2) + private Double responsibility; + + @ApiModelProperty("鏈嶄粠鍒嗗伐") + @ValueTableShow(3) + private Double compliance; + + @ApiModelProperty("绉瀬鎬�") + @ValueTableShow(4) + private Double positive; + + @ApiModelProperty("鍥㈢粨鍚屼簨") + @ValueTableShow(5) + private Double solidarity; + + @ApiModelProperty("鍙婃椂鎬�") + @ValueTableShow(6) + private Double seasonable; + + @ApiModelProperty("鍑嗙‘鎬�") + @ValueTableShow(7) + private Double exact; + + @ApiModelProperty("寰楀垎") + @ValueTableShow(8) + private Double total; +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/EvaluateCompetentService.java b/performance-server/src/main/java/com/yuanchu/mom/service/EvaluateCompetentService.java new file mode 100644 index 0000000..4a20cf4 --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/service/EvaluateCompetentService.java @@ -0,0 +1,16 @@ +package com.yuanchu.mom.service; + +import com.yuanchu.mom.pojo.EvaluateCompetent; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * <p> + * 涓荤鎵撳垎 鏈嶅姟绫� + * </p> + * + * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 + * @since 2024-06-17 01:39:36 + */ +public interface EvaluateCompetentService extends IService<EvaluateCompetent> { + +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/EvaluateGroupService.java b/performance-server/src/main/java/com/yuanchu/mom/service/EvaluateGroupService.java new file mode 100644 index 0000000..f2f2cd1 --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/service/EvaluateGroupService.java @@ -0,0 +1,16 @@ +package com.yuanchu.mom.service; + +import com.yuanchu.mom.pojo.EvaluateGroup; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * <p> + * 鍛樺伐浜掕瘎琛� 鏈嶅姟绫� + * </p> + * + * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 + * @since 2024-06-17 01:39:45 + */ +public interface EvaluateGroupService extends IService<EvaluateGroup> { + +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/EvaluateLeaderService.java b/performance-server/src/main/java/com/yuanchu/mom/service/EvaluateLeaderService.java new file mode 100644 index 0000000..c881cef --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/service/EvaluateLeaderService.java @@ -0,0 +1,16 @@ +package com.yuanchu.mom.service; + +import com.yuanchu.mom.pojo.EvaluateLeader; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * <p> + * 缁勯暱鎵撳垎 鏈嶅姟绫� + * </p> + * + * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 + * @since 2024-06-17 01:39:56 + */ +public interface EvaluateLeaderService extends IService<EvaluateLeader> { + +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/EvaluateService.java b/performance-server/src/main/java/com/yuanchu/mom/service/EvaluateService.java new file mode 100644 index 0000000..ccbcc80 --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/service/EvaluateService.java @@ -0,0 +1,16 @@ +package com.yuanchu.mom.service; + +import com.yuanchu.mom.pojo.Evaluate; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * <p> + * 浜哄憳鑰冭瘎 鏈嶅姟绫� + * </p> + * + * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 + * @since 2024-06-17 01:32:45 + */ +public interface EvaluateService extends IService<Evaluate> { + +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateCompetentServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateCompetentServiceImpl.java new file mode 100644 index 0000000..a835915 --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateCompetentServiceImpl.java @@ -0,0 +1,20 @@ +package com.yuanchu.mom.service.impl; + +import com.yuanchu.mom.pojo.EvaluateCompetent; +import com.yuanchu.mom.mapper.EvaluateCompetentMapper; +import com.yuanchu.mom.service.EvaluateCompetentService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * <p> + * 涓荤鎵撳垎 鏈嶅姟瀹炵幇绫� + * </p> + * + * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 + * @since 2024-06-17 01:39:36 + */ +@Service +public class EvaluateCompetentServiceImpl extends ServiceImpl<EvaluateCompetentMapper, EvaluateCompetent> implements EvaluateCompetentService { + +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateGroupServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateGroupServiceImpl.java new file mode 100644 index 0000000..d16bc28 --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateGroupServiceImpl.java @@ -0,0 +1,20 @@ +package com.yuanchu.mom.service.impl; + +import com.yuanchu.mom.pojo.EvaluateGroup; +import com.yuanchu.mom.mapper.EvaluateGroupMapper; +import com.yuanchu.mom.service.EvaluateGroupService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * <p> + * 鍛樺伐浜掕瘎琛� 鏈嶅姟瀹炵幇绫� + * </p> + * + * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 + * @since 2024-06-17 01:39:45 + */ +@Service +public class EvaluateGroupServiceImpl extends ServiceImpl<EvaluateGroupMapper, EvaluateGroup> implements EvaluateGroupService { + +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateLeaderServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateLeaderServiceImpl.java new file mode 100644 index 0000000..0ca74c5 --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateLeaderServiceImpl.java @@ -0,0 +1,20 @@ +package com.yuanchu.mom.service.impl; + +import com.yuanchu.mom.pojo.EvaluateLeader; +import com.yuanchu.mom.mapper.EvaluateLeaderMapper; +import com.yuanchu.mom.service.EvaluateLeaderService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * <p> + * 缁勯暱鎵撳垎 鏈嶅姟瀹炵幇绫� + * </p> + * + * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 + * @since 2024-06-17 01:39:56 + */ +@Service +public class EvaluateLeaderServiceImpl extends ServiceImpl<EvaluateLeaderMapper, EvaluateLeader> implements EvaluateLeaderService { + +} diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateServiceImpl.java new file mode 100644 index 0000000..a90ea43 --- /dev/null +++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/EvaluateServiceImpl.java @@ -0,0 +1,20 @@ +package com.yuanchu.mom.service.impl; + +import com.yuanchu.mom.pojo.Evaluate; +import com.yuanchu.mom.mapper.EvaluateMapper; +import com.yuanchu.mom.service.EvaluateService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * <p> + * 浜哄憳鑰冭瘎 鏈嶅姟瀹炵幇绫� + * </p> + * + * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 + * @since 2024-06-17 01:32:45 + */ +@Service +public class EvaluateServiceImpl extends ServiceImpl<EvaluateMapper, Evaluate> implements EvaluateService { + +} diff --git a/performance-server/src/main/resources/mapper/AuxiliaryCorrectionHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryCorrectionHoursMapper.xml index 3103c80..fa2a6be 100644 --- a/performance-server/src/main/resources/mapper/AuxiliaryCorrectionHoursMapper.xml +++ b/performance-server/src/main/resources/mapper/AuxiliaryCorrectionHoursMapper.xml @@ -1,48 +1,47 @@ <?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.AuxiliaryCorrectionHoursMapper"> - <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.AuxiliaryCorrectionHours"> - <id column="id" property="id" /> - <result column="name_user" property="nameUser" /> - <result column="type" property="type" /> - <result column="one_hours" property="oneHours" /> - <result column="two_hours" property="twoHours" /> - <result column="three_hours" property="threeHours" /> - <result column="four_hours" property="fourHours" /> - <result column="five_hours" property="fiveHours" /> - <result column="six_hours" property="sixHours" /> - <result column="seven_hours" property="sevenHours" /> - <result column="eight_hours" property="eightHours" /> - <result column="nine_hours" property="nineHours" /> - <result column="ten_hours" property="tenHours" /> - <result column="eleven_hours" property="elevenHours" /> - <result column="twelve_hours" property="twelveHours" /> - <result column="thirteen_hours" property="thirteenHours" /> - <result column="fourteen_hours" property="fourteenHours" /> - <result column="fifteen_hours" property="fifteenHours" /> - <result column="sixteen_hours" property="sixteenHours" /> - <result column="seventeen_hours" property="seventeenHours" /> - <result column="eighteen_hours" property="eighteenHours" /> - <result column="nineteen_hours" property="nineteenHours" /> - <result column="twenty_hours" property="twentyHours" /> - <result column="twenty_one_hours" property="twentyOneHours" /> - <result column="twenty_two_hours" property="twentyTwoHours" /> - <result column="twenty_three_hours" property="twentyThreeHours" /> - <result column="twenty_four_hours" property="twentyFourHours" /> - <result column="twenty_five_hours" property="twentyFiveHours" /> - <result column="twenty_six_hours" property="twentySixHours" /> - <result column="twenty_seven_hours" property="twentySevenHours" /> - <result column="twenty_eight_hours" property="twentyEightHours" /> - <result column="twenty_nine_hours" property="twentyNineHours" /> - <result column="thirty_hours" property="thirtyHours" /> - <result column="thirty_one_hours" property="thirtyOneHours" /> - <result column="month" property="month" /> - <result column="create_time" property="createTime" /> - <result column="update_time" property="updateTime" /> - <result column="create_user" property="createUser" /> - <result column="update_user" property="updateUser" /> + <id column="id" property="id"/> + <result column="name_user" property="nameUser"/> + <result column="type" property="type"/> + <result column="one_hours" property="oneHours"/> + <result column="two_hours" property="twoHours"/> + <result column="three_hours" property="threeHours"/> + <result column="four_hours" property="fourHours"/> + <result column="five_hours" property="fiveHours"/> + <result column="six_hours" property="sixHours"/> + <result column="seven_hours" property="sevenHours"/> + <result column="eight_hours" property="eightHours"/> + <result column="nine_hours" property="nineHours"/> + <result column="ten_hours" property="tenHours"/> + <result column="eleven_hours" property="elevenHours"/> + <result column="twelve_hours" property="twelveHours"/> + <result column="thirteen_hours" property="thirteenHours"/> + <result column="fourteen_hours" property="fourteenHours"/> + <result column="fifteen_hours" property="fifteenHours"/> + <result column="sixteen_hours" property="sixteenHours"/> + <result column="seventeen_hours" property="seventeenHours"/> + <result column="eighteen_hours" property="eighteenHours"/> + <result column="nineteen_hours" property="nineteenHours"/> + <result column="twenty_hours" property="twentyHours"/> + <result column="twenty_one_hours" property="twentyOneHours"/> + <result column="twenty_two_hours" property="twentyTwoHours"/> + <result column="twenty_three_hours" property="twentyThreeHours"/> + <result column="twenty_four_hours" property="twentyFourHours"/> + <result column="twenty_five_hours" property="twentyFiveHours"/> + <result column="twenty_six_hours" property="twentySixHours"/> + <result column="twenty_seven_hours" property="twentySevenHours"/> + <result column="twenty_eight_hours" property="twentyEightHours"/> + <result column="twenty_nine_hours" property="twentyNineHours"/> + <result column="thirty_hours" property="thirtyHours"/> + <result column="thirty_one_hours" property="thirtyOneHours"/> + <result column="month" property="month"/> + <result column="create_time" property="createTime"/> + <result column="update_time" property="updateTime"/> + <result column="create_user" property="createUser"/> + <result column="update_user" property="updateUser"/> </resultMap> <select id="selectAuxiliaryCorrectionHours" resultType="com.yuanchu.mom.dto.AuxiliaryCorrectionHoursDto"> select data.* @@ -62,6 +61,8 @@ </if> </select> <select id="selDepartLimsByName" resultType="java.lang.Integer"> - select id from department_lims where name LIKE CONCAT('%', #{departLims}, '%'); + select id + from department_lims + where name LIKE CONCAT('%', #{departLims}, '%'); </select> </mapper> diff --git a/performance-server/src/main/resources/mapper/EvaluateCompetentMapper.xml b/performance-server/src/main/resources/mapper/EvaluateCompetentMapper.xml new file mode 100644 index 0000000..7d5b982 --- /dev/null +++ b/performance-server/src/main/resources/mapper/EvaluateCompetentMapper.xml @@ -0,0 +1,23 @@ +<?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.EvaluateCompetentMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.EvaluateCompetent"> + <id column="id" property="id" /> + <result column="evaluate_id" property="evaluateId" /> + <result column="create_time" property="createTime" /> + <result column="update_time" property="updateTime" /> + <result column="create_user" property="createUser" /> + <result column="update_user" property="updateUser" /> + <result column="skill" property="skill" /> + <result column="compliance" property="compliance" /> + <result column="positive" property="positive" /> + <result column="tidy" property="tidy" /> + <result column="discipline" property="discipline" /> + <result column="solidarity" property="solidarity" /> + <result column="proposal" property="proposal" /> + <result column="total" property="total" /> + </resultMap> + +</mapper> diff --git a/performance-server/src/main/resources/mapper/EvaluateGroupMapper.xml b/performance-server/src/main/resources/mapper/EvaluateGroupMapper.xml new file mode 100644 index 0000000..3f05f98 --- /dev/null +++ b/performance-server/src/main/resources/mapper/EvaluateGroupMapper.xml @@ -0,0 +1,23 @@ +<?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.EvaluateGroupMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.EvaluateGroup"> + <id column="id" property="id" /> + <result column="evaluate_id" property="evaluateId" /> + <result column="seasonable" property="seasonable" /> + <result column="exact" property="exact" /> + <result column="skill" property="skill" /> + <result column="preserve" property="preserve" /> + <result column="discipline" property="discipline" /> + <result column="solidarity" property="solidarity" /> + <result column="tidy" property="tidy" /> + <result column="total" property="total" /> + <result column="create_time" property="createTime" /> + <result column="update_time" property="updateTime" /> + <result column="create_user" property="createUser" /> + <result column="update_user" property="updateUser" /> + </resultMap> + +</mapper> diff --git a/performance-server/src/main/resources/mapper/EvaluateLeaderMapper.xml b/performance-server/src/main/resources/mapper/EvaluateLeaderMapper.xml new file mode 100644 index 0000000..a5009fb --- /dev/null +++ b/performance-server/src/main/resources/mapper/EvaluateLeaderMapper.xml @@ -0,0 +1,22 @@ +<?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.EvaluateLeaderMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.EvaluateLeader"> + <id column="id" property="id" /> + <result column="evaluate_id" property="evaluateId" /> + <result column="create_time" property="createTime" /> + <result column="update_time" property="updateTime" /> + <result column="create_user" property="createUser" /> + <result column="update_user" property="updateUser" /> + <result column="responsibility" property="responsibility" /> + <result column="compliance" property="compliance" /> + <result column="positive" property="positive" /> + <result column="solidarity" property="solidarity" /> + <result column="seasonable" property="seasonable" /> + <result column="exact" property="exact" /> + <result column="total" property="total" /> + </resultMap> + +</mapper> diff --git a/performance-server/src/main/resources/mapper/EvaluateMapper.xml b/performance-server/src/main/resources/mapper/EvaluateMapper.xml new file mode 100644 index 0000000..126f445 --- /dev/null +++ b/performance-server/src/main/resources/mapper/EvaluateMapper.xml @@ -0,0 +1,14 @@ +<?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.EvaluateMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.Evaluate"> + <id column="id" property="id" /> + <result column="user_id" property="userId" /> + <result column="score" property="score" /> + <result column="grade" property="grade" /> + <result column="month" property="month" /> + </resultMap> + +</mapper> 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 6bb30e0..d6c63d8 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 = "/inspect-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲 + public static String model_name = "/performance-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲 public static String setParent = "com.yuanchu.mom"; // 鍖呰矾寰� public static void main(String[] args) { String projectPath = System.getProperty("user.dir"); -- Gitblit v1.9.3