From fe9be91df2db0b841965a4a4c929c7aa9ffc1523 Mon Sep 17 00:00:00 2001
From: Joe <joe_96@163.com>
Date: Wed, 24 May 2023 22:55:50 +0800
Subject: [PATCH] init

---
 Sqlitedb/training.db                          | Bin 5963776 -> 5963776 bytes
 .../java/com/jingcheng/cms/model/Honor.java   |   2 +-
 .../cms/service/impl/EmployeeServiceImpl.java |  49 ++++++++++++------
 .../service/impl/InfoSettingServiceImpl.java  |   6 +--
 4 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/Sqlitedb/training.db b/Sqlitedb/training.db
index 849fbdd05d347c4fc8af2f58d4ee819b7f0248f8..a0fd03c53c3befc08474fdbf130c32547449b63e 100644
GIT binary patch
delta 14233
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
J`A}2X@jup}YKQ;;

delta 552
zcmd7Py-vbV7{>8)PNAjJkE0Y(0gHl)UoaXb&MmMx;!uN$SW@EPVlWIfaZyM#ZYB=G
z1cadri8mnk;o#88!O7<m936hke|n$1oz55Qz<pYe6A~Rm4qhLMM>IaEk8Jum<++B*
z6Kcb~a6R*lSnBCX^Q?bcwizM)VYyn;B2tz*&DObl<v2==N-6cS?RagS5Ta-U$#^y`
z^Ug@>k9tNMOm2D_^OXK|CGXE?2XF|bU_L8XroJ3X5P>Mjpg;^%Sb#Wapo0M>a9D&T
zNPq=NScVj=z$&ak8ZwZDb+91^8?Xs^D8LqM!wwW-7xn@<-2Zv+QsGlUfdy1Z(Q%gx
rpCfPtE~M|#e+g4Aj_ax*gbwl6!jl%(dW?MpFJY}-{nL@yL#@^?JW94-

diff --git a/src/main/java/com/jingcheng/cms/model/Honor.java b/src/main/java/com/jingcheng/cms/model/Honor.java
index 6e7cb42..5c023dd 100644
--- a/src/main/java/com/jingcheng/cms/model/Honor.java
+++ b/src/main/java/com/jingcheng/cms/model/Honor.java
@@ -47,7 +47,7 @@ public class Honor {
      *
      * @mbggenerated Wed May 03 18:26:57 CST 2023
      */
-    @Excel(name = "荣誉说明", orderNum = "3")
+    @Excel(name = "奖惩内容", orderNum = "3")
     private String honorDescription;
 
     /**
diff --git a/src/main/java/com/jingcheng/cms/service/impl/EmployeeServiceImpl.java b/src/main/java/com/jingcheng/cms/service/impl/EmployeeServiceImpl.java
index 78dc76c..1e44f05 100644
--- a/src/main/java/com/jingcheng/cms/service/impl/EmployeeServiceImpl.java
+++ b/src/main/java/com/jingcheng/cms/service/impl/EmployeeServiceImpl.java
@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jingcheng.cms.constants.Constants;
 import com.jingcheng.cms.mapper.*;
@@ -52,12 +53,21 @@ public class EmployeeServiceImpl implements EmployeeService {
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("state",Constants.STATE_VALID);
         String honorLevel = jsonObject.getString("honorLevel");
+        String honorDescription = jsonObject.getString("honorDescription");
+        JSONArray jsonArray = jsonObject.getJSONArray("ptqIds");
+        List<Long> ptqIds = jsonArray != null ? jsonArray.toJavaList(Long.class) : new ArrayList<>();
         List<String> honorEmployees = new ArrayList<>();
-        if (StringUtils.isNotEmpty(honorLevel)) {
-            Honor honor = new Honor();
-            honor.setHonorLevel(honorLevel);
-            honor.setState(Constants.STATE_VALID);
-            List<Honor> honors = honorMapper.select(honor);
+        if (StringUtils.isNotEmpty(honorLevel) || StringUtils.isNotEmpty(honorDescription)) {
+            Example example1 = new Example(Honor.class);
+            Example.Criteria criteria1 = example1.createCriteria();
+            criteria1.andEqualTo("state",Constants.STATE_VALID);
+            if (StringUtils.isNotEmpty(honorLevel)) {
+                criteria1.andEqualTo("honorLevel", honorLevel);
+            }
+            if (StringUtils.isNotEmpty(honorDescription)) {
+                criteria1.andLike("honorDescription", "%"+honorDescription+"%");
+            }
+            List<Honor> honors = honorMapper.selectByExample(example1);
             honorEmployees.addAll(honors.stream().map(item -> item.getEmployeeNo()).collect(Collectors.toSet()));
         }
         Integer current = jsonObject.getInteger("current") == null ? 1 : jsonObject.getInteger("current");
@@ -68,11 +78,11 @@ public class EmployeeServiceImpl implements EmployeeService {
         if (StringUtils.isNotEmpty(employee.getMobile())) criteria.andLike("mobile", "%"+employee.getMobile()+"%");
         if (null != employee.getPostId()) criteria.andEqualTo("postId", employee.getPostId());
         if (null != employee.getGroupsId()) criteria.andEqualTo("groupsId", employee.getGroupsId());
-        if (null != employee.getPtqId()) criteria.andEqualTo("ptqId", employee.getPtqId());
+        if (null != ptqIds && ptqIds.size() > 0) criteria.andIn("ptqId", ptqIds);
         if (null != employee.getSkillLevelId()) criteria.andEqualTo("skillLevelId", employee.getSkillLevelId());
         if (null != employee.getHighestEducationId()) criteria.andEqualTo("highestEducationId", employee.getHighestEducationId());
         List<Employee> employeeList = employeeMapper.selectByExample(example);
-        if (StringUtils.isNotEmpty(honorLevel) && honorEmployees.size() == 0) employeeList = new ArrayList<>();
+        if ((StringUtils.isNotEmpty(honorLevel) || StringUtils.isNotEmpty(honorDescription)) && honorEmployees.size() == 0) employeeList = new ArrayList<>();
         JSONObject pageJson = PageUtils.page(employeeList,current,pageSize);
         return pageJson;
     }
@@ -85,12 +95,21 @@ public class EmployeeServiceImpl implements EmployeeService {
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("state",Constants.STATE_VALID);
         String honorLevel = jsonObject.getString("honorLevel");
+        String honorDescription = jsonObject.getString("honorDescription");
+        JSONArray jsonArray = jsonObject.getJSONArray("ptqIds");
+        List<Long> ptqIds = jsonArray.toJavaList(Long.class);
         List<String> honorEmployees = new ArrayList<>();
-        if (StringUtils.isNotEmpty(honorLevel)) {
-            Honor honor = new Honor();
-            honor.setHonorLevel(honorLevel);
-            honor.setState(Constants.STATE_VALID);
-            List<Honor> honors = honorMapper.select(honor);
+        if (StringUtils.isNotEmpty(honorLevel) || StringUtils.isNotEmpty(honorDescription)) {
+            Example example1 = new Example(Honor.class);
+            Example.Criteria criteria1 = example1.createCriteria();
+            criteria1.andEqualTo("state",Constants.STATE_VALID);
+            if (StringUtils.isNotEmpty(honorLevel)) {
+                criteria1.andEqualTo("honorLevel", honorLevel);
+            }
+            if (StringUtils.isNotEmpty(honorDescription)) {
+                criteria1.andLike("honorDescription", "%"+honorDescription+"%");
+            }
+            List<Honor> honors = honorMapper.selectByExample(example1);
             honorEmployees.addAll(honors.stream().map(item -> item.getEmployeeNo()).collect(Collectors.toSet()));
         }
         if (StringUtils.isNotEmpty(employee.getEmployeeNo())) criteria.andLike("employeeNo", "%"+employee.getEmployeeNo()+"%");
@@ -99,11 +118,11 @@ public class EmployeeServiceImpl implements EmployeeService {
         if (StringUtils.isNotEmpty(employee.getMobile())) criteria.andLike("mobile", "%"+employee.getMobile()+"%");
         if (null != employee.getPostId()) criteria.andEqualTo("postId", employee.getPostId());
         if (null != employee.getGroupsId()) criteria.andEqualTo("groupsId", employee.getGroupsId());
-        if (null != employee.getPtqId()) criteria.andEqualTo("ptqId", employee.getPtqId());
+        if (null != ptqIds && ptqIds.size() > 0) criteria.andIn("ptqId", ptqIds);
         if (null != employee.getSkillLevelId()) criteria.andEqualTo("skillLevelId", employee.getSkillLevelId());
         if (null != employee.getHighestEducationId()) criteria.andEqualTo("highestEducationId", employee.getHighestEducationId());
         List<Employee> employeeList = employeeMapper.selectByExample(example);
-        if (StringUtils.isNotEmpty(honorLevel) && honorEmployees.size() == 0) employeeList = new ArrayList<>();
+        if ((StringUtils.isNotEmpty(honorLevel) || StringUtils.isNotEmpty(honorDescription)) && honorEmployees.size() == 0) employeeList = new ArrayList<>();
         ExportParams exportParams = new ExportParams();
         Workbook workbook = ExcelExportUtil.exportExcel(exportParams,Employee.class, employeeList);
         ExcelUtils.export(workbook, response, "员工导出");
@@ -198,7 +217,7 @@ public class EmployeeServiceImpl implements EmployeeService {
                 employeeListUpdate.add(employee);
             }
         }
-        employeeMapper.insertList(employeeListInsert);
+        if(employeeListInsert.size() > 0) employeeMapper.insertList(employeeListInsert);
         if (employeeListUpdate != null && employeeListUpdate.size() != 0) {
             for (Employee employee : employeeListUpdate) {
                 employeeMapper.updateByPrimaryKey(employee);
diff --git a/src/main/java/com/jingcheng/cms/service/impl/InfoSettingServiceImpl.java b/src/main/java/com/jingcheng/cms/service/impl/InfoSettingServiceImpl.java
index 7ccc73e..7e80638 100644
--- a/src/main/java/com/jingcheng/cms/service/impl/InfoSettingServiceImpl.java
+++ b/src/main/java/com/jingcheng/cms/service/impl/InfoSettingServiceImpl.java
@@ -48,7 +48,7 @@ public class InfoSettingServiceImpl implements InfoSettingService {
         AjaxResult ajaxResult = new AjaxResult();
         InfoSetting infoSetting = JSONObject.toJavaObject(jsonObject, InfoSetting.class);
         JSONArray jsonArray = jsonObject.getJSONArray("infoSettingValues");
-        List<InfoSettingValue> infoSettingValues = jsonArray.toJavaList(InfoSettingValue.class);
+        List<InfoSettingValue> infoSettingValues = jsonArray != null ? jsonArray.toJavaList(InfoSettingValue.class) : new ArrayList<>();
         infoSetting.setState(Constants.ENABLE);
         if (null == infoSetting.getId()) {
             infoSetting.setState(Constants.ENABLE);
@@ -59,7 +59,7 @@ public class InfoSettingServiceImpl implements InfoSettingService {
                 }
                 infoSettingValue.setState(Constants.ENABLE);
             }
-            infoSettingValueMapper.insertList(infoSettingValues);
+            if (infoSettingValues.size() > 0) infoSettingValueMapper.insertList(infoSettingValues);
         } else {
             infoSettingMapper.updateByPrimaryKey(infoSetting);
             InfoSettingValue infoSettingValue = new InfoSettingValue();
@@ -69,7 +69,7 @@ public class InfoSettingServiceImpl implements InfoSettingService {
                 infoSettingValue1.setSettingId(infoSetting.getId());
                 infoSettingValue.setState(Constants.ENABLE);
             }
-            infoSettingValueMapper.insertList(infoSettingValues);
+            if (infoSettingValues.size() > 0) infoSettingValueMapper.insertList(infoSettingValues);
         }
         return ajaxResult;
     }