From 4823d75b28a9065efcf61d967b23b8d3125a0b4e Mon Sep 17 00:00:00 2001 From: "lj7788@126.com" Date: Mon, 1 Sep 2025 16:45:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=80=83=E5=8B=A4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=BC=80=E5=8F=91-=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/components/MonitAndWarning.vue | 18 +- .../domain/ProMobileAttendanceConfig.java | 30 +- .../ProMobileAttendanceConfigGroup.java | 19 + .../ProMobileAttendanceConfigGroupMapper.java | 3 +- .../ProMobileAttendanceConfigMapper.java | 5 + .../ProMobileAttendanceConfigGroupMapper.xml | 2 +- .../ProMobileAttendanceConfigMapper.xml | 59 ++- .../trouble/SmzSspProblemmodifyMapper.xml | 4 +- .../ProMobileAttendanceConfigController.java | 9 + .../IProMobileAttendanceConfigService.java | 5 + .../ProMobileAttendanceConfigServiceImpl.java | 9 +- yanzhu-ui-app/miniprogram/api/project.js | 53 +++ yanzhu-ui-app/miniprogram/app.json | 251 ++++++------ .../miniprogram/images/svg/attendance.svg | 7 + .../attendance_config/add/index.js | 381 ++++++++++++------ .../attendance_config/add/index.wxml | 8 +- .../attendance_config/info/index.js | 104 +++++ .../attendance_config/info/index.json | 6 + .../attendance_config/info/index.wxml | 19 + .../attendance_config/info/index.wxss | 1 + .../attendance_config/list/index.js | 112 ++--- .../attendance_config/list/index.json | 4 +- .../attendance_config/list/index.wxml | 48 ++- .../attendance_config/list/index.wxss | 21 +- 24 files changed, 828 insertions(+), 350 deletions(-) create mode 100644 yanzhu-ui-app/miniprogram/images/svg/attendance.svg create mode 100644 yanzhu-ui-app/miniprogram/pageage/mobile_attendance/attendance_config/info/index.js create mode 100644 yanzhu-ui-app/miniprogram/pageage/mobile_attendance/attendance_config/info/index.json create mode 100644 yanzhu-ui-app/miniprogram/pageage/mobile_attendance/attendance_config/info/index.wxml create mode 100644 yanzhu-ui-app/miniprogram/pageage/mobile_attendance/attendance_config/info/index.wxss diff --git a/yanzhu-bigscreen/src/views/components/MonitAndWarning.vue b/yanzhu-bigscreen/src/views/components/MonitAndWarning.vue index 094233c1..75c9852f 100644 --- a/yanzhu-bigscreen/src/views/components/MonitAndWarning.vue +++ b/yanzhu-bigscreen/src/views/components/MonitAndWarning.vue @@ -98,8 +98,18 @@ export default { this.$bus.$on('projectChange', debounce(res => { this.prjInfo = res; //this.getMonitAndWarning(); - debugger - this.$api.safety.selectCountForBGByProjectId(res.id).then(d => { + this.loadData(); + + })); + this.prjInfo = this.$store.getters.selProject; + this.loadData(); + }, + methods: { + loadData(){ + if(!this.prjInfo){ + return + } + this.$api.safety.selectCountForBGByProjectId(this.prjInfo.id).then(d => { this.baseData = d.data || []; this.warningType[0].total = this.getBaseData("a"); this.warningType[1].total = this.getBaseData("c"); @@ -109,9 +119,7 @@ export default { this.todayCnt = this.getBaseData("g"); this.weekCnt = this.getBaseData("h"); }); - })); - }, - methods: { + }, getBaseData(type) { let tmp = this.baseData.find(item => item.projectName == type); return tmp ? tmp.id || 0 : 0; diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfig.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfig.java index 5c24d02d..77edd9c7 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfig.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfig.java @@ -38,7 +38,7 @@ public class ProMobileAttendanceConfig extends BaseEntity /** 开始时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date starteDate; + private Date startDate; /** 结束时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @@ -47,6 +47,24 @@ public class ProMobileAttendanceConfig extends BaseEntity private List groupList; + private Integer isDel; + + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + public Integer getIsDel() { + return isDel; + } + + public void setIsDel(Integer isDel) { + this.isDel = isDel; + } + public List getGroupList() { return groupList; } @@ -115,15 +133,7 @@ public class ProMobileAttendanceConfig extends BaseEntity { return title; } - public void setStarteDate(Date starteDate) - { - this.starteDate = starteDate; - } - public Date getStarteDate() - { - return starteDate; - } public void setEndDate(Date endDate) { this.endDate = endDate; @@ -195,7 +205,7 @@ public class ProMobileAttendanceConfig extends BaseEntity .append("comId", getComId()) .append("projectId", getProjectId()) .append("title", getTitle()) - .append("starteDate", getStarteDate()) + .append("startDate", getStartDate()) .append("endDate", getEndDate()) .append("address", getAddress()) .append("longitude", getLongitude()) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfigGroup.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfigGroup.java index db1ce05a..3532fe00 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfigGroup.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfigGroup.java @@ -55,6 +55,25 @@ public class ProMobileAttendanceConfigGroup extends BaseEntity return groupId; } + private String groupName; + private String deptName; + + public String getGroupName() { + return groupName; + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProMobileAttendanceConfigGroupMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProMobileAttendanceConfigGroupMapper.java index 9bf03591..05d97eeb 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProMobileAttendanceConfigGroupMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProMobileAttendanceConfigGroupMapper.java @@ -2,6 +2,7 @@ package com.yanzhu.manage.mapper; import java.util.List; import com.yanzhu.manage.domain.ProMobileAttendanceConfigGroup; +import org.apache.ibatis.annotations.Param; /** * 移动端考勤配置分组信息Mapper接口 @@ -67,5 +68,5 @@ public interface ProMobileAttendanceConfigGroupMapper */ public int deleteProMobileAttendanceConfigGroupByCfgId(Long cfgId); - public int insertProMobileAttendanceConfigGroupBatch(List groupList); + public int insertProMobileAttendanceConfigGroupBatch(@Param("groupList") List groupList); } \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProMobileAttendanceConfigMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProMobileAttendanceConfigMapper.java index 40cea124..457c6cd4 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProMobileAttendanceConfigMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProMobileAttendanceConfigMapper.java @@ -2,6 +2,7 @@ package com.yanzhu.manage.mapper; import java.util.List; import com.yanzhu.manage.domain.ProMobileAttendanceConfig; +import org.apache.ibatis.annotations.Param; /** * 移动端考勤配置Mapper接口 @@ -58,4 +59,8 @@ public interface ProMobileAttendanceConfigMapper * @return 结果 */ public int deleteProMobileAttendanceConfigByIds(Long[] ids); + /** + * 获取有效和无效数据量 + */ + List selectCountByValid(@Param("projectId") Long projectId); } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigGroupMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigGroupMapper.xml index d9863549..fe5e9c12 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigGroupMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigGroupMapper.xml @@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into pro_mobile_attendance_config_group (cfg_id, group_id) values - + (#{item.cfgId}, #{item.groupId}) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigMapper.xml index 5022b299..fab1e7f7 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigMapper.xml @@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -17,37 +17,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + - select id, com_id, project_id, title, starte_date, end_date, address, longitude, latitude, valid, rang, state, remark, create_by, create_time, update_by, update_time from pro_mobile_attendance_config + select c.id, c.com_id, c.project_id, c.title, c.start_date, c.end_date, c.address, c.longitude, c.latitude, c.valid, c.rang, c.state, c.is_del, c.remark, c.create_by, c.create_time, c.update_by, c.update_time, g.id as group_id, g.cfg_id, g.group_id as group_id, pg.group_name, pg.sub_dept_name as dept_name + from pro_mobile_attendance_config c + left join pro_mobile_attendance_config_group g on c.id=g.cfg_id + left join pro_project_info_subdepts_group pg on g.group_id=pg.id - + + @@ -56,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" com_id, project_id, title, - starte_date, + start_date, end_date, address, longitude, @@ -64,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" valid, rang, state, + is_del, remark, create_by, create_time, @@ -74,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{comId}, #{projectId}, #{title}, - #{starteDate}, + #{startDate}, #{endDate}, #{address}, #{longitude}, @@ -82,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{valid}, #{rang}, #{state}, + #{isDel}, #{remark}, #{createBy}, #{createTime}, @@ -96,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" com_id = #{comId}, project_id = #{projectId}, title = #{title}, - starte_date = #{starteDate}, + start_date = #{startDate}, end_date = #{endDate}, address = #{address}, longitude = #{longitude}, @@ -104,6 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" valid = #{valid}, rang = #{rang}, state = #{state}, + is_del = #{isDel}, remark = #{remark}, create_by = #{createBy}, create_time = #{createTime}, diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml index fe4bb3e0..ad6e33ab 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml @@ -528,9 +528,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and dic.remark = #{infoType}