haozq
/
ah_jjzhgd_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工程管理

This commit is contained in:
cwchen 2024-03-30 20:50:05 +08:00
parent 3aa0e2adff
commit cd3394233e
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/GxPlanProgressVo.java
View File

@ -68,7 +68,7 @@ public class GxPlanProgressVo {
private double planProgress; private double planProgress;
@ApiModelProperty(value = "工序名称") @ApiModelProperty(value = "工序名称")
private String gxName; private String currentGxName;
/** /**
* 查询条件限制 * 查询条件限制

3
securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml
View File

@ -138,9 +138,8 @@
<select id="getPersonnelAccessLists" resultType="com.securitycontrol.entity.background.vo.UserAccessVo"> <select id="getPersonnelAccessLists" resultType="com.securitycontrol.entity.background.vo.UserAccessVo">
SELECT tua.user_name AS userName, SELECT tua.user_name AS userName,
tua.access_time AS accessTime, tua.access_time AS accessTime,
sd.dict_name AS accessType IF(access_type == '1','入场','出场') AS accessType
FROM tb_user_access tua FROM tb_user_access tua
LEFT JOIN sys_dict sd ON tua.access_type = sd.dict_code
WHERE user_id = #{id} WHERE user_id = #{id}
<if test="startTime!=null and startTime!='' and endTime!=null and endTime!=''"> <if test="startTime!=null and startTime!='' and endTime!=null and endTime!=''">
AND tua.access_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') AND tua.access_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')

4
securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml
View File

@ -122,12 +122,12 @@
resultType="com.securitycontrol.entity.system.base.vo.GxPlanProgressVo"> resultType="com.securitycontrol.entity.system.base.vo.GxPlanProgressVo">
SELECT tpp.gx_progress AS gxProgress, SELECT tpp.gx_progress AS gxProgress,
tpp.create_time AS createTime, tpp.create_time AS createTime,
sd.dict_name AS gxName sd.dict_name AS currentGxName
FROM tb_project_progress tpp FROM tb_project_progress tpp
LEFT JOIN tb_gx_plan tgp ON tpp.plan_id = tgp.plan_id AND tgp.del_flag = 0 LEFT JOIN tb_gx_plan tgp ON tpp.plan_id = tgp.plan_id AND tgp.del_flag = 0
LEFT JOIN sys_dict sd on tpp.gx_id = sd.dict_code AND sd.del_flag = 0 LEFT JOIN sys_dict sd on tpp.gx_id = sd.dict_code AND sd.del_flag = 0
WHERE tpp.plan_id = #{planId} WHERE tpp.plan_id = #{planId}
ORDER BY tpp.create_time ORDER BY tpp.gx_id,tpp.create_time
</select> </select>
<!--工序计划是否第一次填报--> <!--工序计划是否第一次填报-->
<select id="isFirstFillingGxProgress" resultType="java.lang.Integer"> <select id="isFirstFillingGxProgress" resultType="java.lang.Integer">