wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

Browse Source
This commit is contained in:
fumeiai 2020-06-04 20:58:48 +08:00
parent a43a3831cd
commit 5d94ff5ab5
9 changed files with 58091 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.idea/workspace.xml generated
View File

@ -3,11 +3,11 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e4baaf01-a2c2-445d-98a1-9f4c50c148cf" name="Default Changelist" comment=""> <list default="true" id="e4baaf01-a2c2-445d-98a1-9f4c50c148cf" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/common/utils/DhgjSmsUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/common/utils/DhgjSmsUtil.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/logback/api-all.log" beforeDir="false" afterPath="$PROJECT_DIR$/logback/api-all.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/sys/controller/SysLoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/sys/controller/SysLoginController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/logback/api-error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logback/api-error.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/logback-spring.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/logback-spring.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/logback/api-info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logback/api-info.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/lz/common/utils/DhgjSmsUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/common/utils/DhgjSmsUtil.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/common/utils/ExcelUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/common/utils/ExcelUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/sys/controller/SysLoginController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/sys/controller/SysLoginController.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffProjectExperienceDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffProjectExperienceDao.xml" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -178,7 +178,7 @@
<workItem from="1590038091791" duration="38394000" /> <workItem from="1590038091791" duration="38394000" />
<workItem from="1590136970394" duration="34977000" /> <workItem from="1590136970394" duration="34977000" />
<workItem from="1590560185803" duration="9619000" /> <workItem from="1590560185803" duration="9619000" />
<workItem from="1590633459230" duration="29568000" /> <workItem from="1590633459230" duration="32009000" />
</task> </task>
<servers /> <servers />
</component> </component>

0
logback/api-all.log → logback/logs/api-all.2020-06-02.0.log
View File

24052
logback/logs/api-all.2020-06-03.0.log Normal file
View File

File diff suppressed because it is too large Load Diff

0
logback/api-error.log → logback/logs/api-error.2020-06-02.0.log
View File

16656
logback/logs/api-error.2020-06-03.0.log Normal file
View File

File diff suppressed because it is too large Load Diff

0
logback/api-info.log → logback/logs/api-info.2020-06-02.0.log
View File

17374
logback/logs/api-info.2020-06-03.0.log Normal file
View File

File diff suppressed because it is too large Load Diff

2
src/main/java/com/lz/common/utils/ExcelUtil.java
View File

@ -1092,6 +1092,8 @@ public class ExcelUtil {
cellValue = GenderEnum.findCodeByName(cellValue).toString(); cellValue = GenderEnum.findCodeByName(cellValue).toString();
} else if (StringUtil.equals(MaritalStatusEnum.unmarried.getName(), cellValue) || StringUtil.equals(MaritalStatusEnum.married.getName(), cellValue)) { } else if (StringUtil.equals(MaritalStatusEnum.unmarried.getName(), cellValue) || StringUtil.equals(MaritalStatusEnum.married.getName(), cellValue)) {
cellValue = MaritalStatusEnum.findCodeByName(cellValue).toString(); cellValue = MaritalStatusEnum.findCodeByName(cellValue).toString();
} else if (StringUtil.equals("至今", cellValue)) {
cellValue = "";
} }
dataMap.put(ExcelStaffHeardEnum.findFieldByName(headList.get(col)), cellValue); dataMap.put(ExcelStaffHeardEnum.findFieldByName(headList.get(col)), cellValue);
} }

2
src/main/resources/mapper/generator/StaffProjectExperienceDao.xml
View File

@ -17,7 +17,7 @@
</resultMap> </resultMap>
<select id="getProjectInfoByStaffId" resultType="com.lz.modules.app.dto.StaffProjectExperienceDto"> <select id="getProjectInfoByStaffId" resultType="com.lz.modules.app.dto.StaffProjectExperienceDto">
SELECT project_name,project_begin_time,project_end_time,project_content from lz_staff_project_experience where is_delete=0 and staff_id=#{staffId} SELECT project_name,project_begin_time,if(project_end_time is null,'至今',project_end_time) project_end_time,project_content from lz_staff_project_experience where is_delete=0 and staff_id=#{staffId}
</select> </select>