From 8add9bb887a1b104922749a8a1c66808aa30bba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sat, 22 Mar 2025 18:48:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/enums/UserTypeEnums.java | 2 +- .../mapper/FlowBusinessKeyMapper.java | 7 + .../domain/ProProjectInfoSubdeptsGroup.java | 37 +- .../ProProjectInfoSubdeptsUsersMapper.java | 33 + .../mapper/flowable/FlowBusinessKeyMapper.xml | 9 +- .../ProProjectInfoSubdeptsGroupMapper.xml | 8 +- .../ProProjectInfoSubdeptsUsersMapper.xml | 14 + .../controller/FlowBusinessKeyController.java | 10 + .../service/IFlowBusinessKeyService.java | 7 + .../impl/FlowBusinessKeyServiceImpl.java | 10 + .../impl/FlowDefinitionServiceImpl.java | 2 +- ...ProProjectInfoSubdeptsGroupController.java | 31 +- ...ProProjectInfoSubdeptsUsersController.java | 75 +- .../IProProjectInfoSubdeptsUsersService.java | 16 + ...roProjectInfoSubdeptsGroupServiceImpl.java | 120 +-- .../ProProjectInfoSubdeptsServiceImpl.java | 13 +- ...roProjectInfoSubdeptsUsersServiceImpl.java | 113 ++- .../system/controller/SysUserController.java | 12 + .../system/service/ISysUserService.java | 8 + .../service/impl/SysUserServiceImpl.java | 74 ++ yanzhu-ui-app/miniprogram/api/project.js | 132 +++- yanzhu-ui-app/miniprogram/app.json | 5 +- yanzhu-ui-app/miniprogram/app.wxss | 17 +- .../pages/components/voucher-select/index.js | 113 +-- .../project_flowable/approveTask/index.js | 6 +- .../project_flowable/approveTask/index.wxml | 4 +- .../project_flowable/detailTask/index.js | 6 +- .../project_flowable/detailTask/index.wxml | 4 +- .../project_flowable/editTask/index.wxml | 2 +- .../pages/project_magusers/add/index.js | 66 ++ .../pages/project_magusers/add/index.json | 3 + .../pages/project_magusers/add/index.wxml | 2 + .../pages/project_magusers/add/index.wxss | 1 + .../pages/project_magusers/info/index.js | 66 ++ .../pages/project_magusers/info/index.json | 3 + .../pages/project_magusers/info/index.wxml | 2 + .../pages/project_magusers/info/index.wxss | 1 + .../pages/project_magusers/list/index.js | 228 ++++++ .../pages/project_magusers/list/index.json | 9 + .../pages/project_magusers/list/index.wxml | 61 ++ .../pages/project_magusers/list/index.wxss | 19 + .../miniprogram/pages/project_qr/index.js | 2 + .../miniprogram/pages/project_qr/index.wxml | 134 +++- .../pages/project_subdepts/add/index.js | 228 ++++-- .../pages/project_subdepts/add/index.wxml | 54 +- .../pages/project_subdepts/add/index.wxss | 20 +- .../pages/project_subdepts/info/index.js | 199 ++++- .../pages/project_subdepts/info/index.json | 5 +- .../pages/project_subdepts/info/index.wxml | 279 ++++++- .../pages/project_subdepts/info/index.wxss | 12 +- .../pages/project_subdepts/list/index.js | 17 +- .../pages/project_subdepts/list/index.wxml | 5 +- .../pages/project_subdepts/list/index.wxss | 12 +- .../pages/project_subgroups/add/index.js | 223 +++++- .../pages/project_subgroups/add/index.json | 7 +- .../pages/project_subgroups/add/index.wxml | 84 ++- .../pages/project_subgroups/add/index.wxss | 12 +- .../pages/project_subgroups/info/index.js | 219 +++++- .../pages/project_subgroups/info/index.json | 5 +- .../pages/project_subgroups/info/index.wxml | 141 +++- .../pages/project_subgroups/info/index.wxss | 12 +- .../pages/project_subgroups/list/index.js | 156 +++- .../pages/project_subgroups/list/index.json | 8 +- .../pages/project_subgroups/list/index.wxml | 57 +- .../pages/project_subgroups/list/index.wxss | 15 +- .../pages/project_subusers/add/index.js | 712 +++++++++++++++++- .../pages/project_subusers/add/index.json | 7 +- .../pages/project_subusers/add/index.wxml | 237 +++++- .../pages/project_subusers/add/index.wxss | 12 +- .../pages/project_subusers/info/index.js | 259 ++++++- .../pages/project_subusers/info/index.json | 5 +- .../pages/project_subusers/info/index.wxml | 246 +++++- .../pages/project_subusers/info/index.wxss | 12 +- .../pages/project_subusers/list/index.js | 164 +++- .../pages/project_subusers/list/index.json | 8 +- .../pages/project_subusers/list/index.wxml | 63 +- .../pages/project_subusers/list/index.wxss | 20 +- 77 files changed, 4671 insertions(+), 331 deletions(-) create mode 100644 yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.js create mode 100644 yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.json create mode 100644 yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.wxml create mode 100644 yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.wxss create mode 100644 yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.js create mode 100644 yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.json create mode 100644 yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.wxml create mode 100644 yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.wxss create mode 100644 yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.js create mode 100644 yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.json create mode 100644 yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.wxml create mode 100644 yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.wxss diff --git a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/UserTypeEnums.java b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/UserTypeEnums.java index f1534a8f..d78a9184 100644 --- a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/UserTypeEnums.java +++ b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/UserTypeEnums.java @@ -14,7 +14,7 @@ public enum UserTypeEnums { FBLWRY("77", "分包劳务人员","fblwry"), FBCLRY("76", "分包材料人员","fbclry"), FBAQRY("75", "分包安全人员","fbaqry"), - JSDWRY("66", "建设单位人员","jsdw"), + JSDWRY("66", "总包单位管理","jsdw"), JLDWRY("81", "监理单位人员","jldw"), SGDWRY("82", "施工单位人员","sgdw"), CLFBRY("83", "材料分包人员","clfb"), diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/flowable/mapper/FlowBusinessKeyMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/flowable/mapper/FlowBusinessKeyMapper.java index 181f18e7..a29a4515 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/flowable/mapper/FlowBusinessKeyMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/flowable/mapper/FlowBusinessKeyMapper.java @@ -32,6 +32,13 @@ public interface FlowBusinessKeyMapper { */ public List> selectCommentByProcInsId(String procInsId); + /** + * 根据条件业务Id查询操作日志 + * @param businessKey + * @return + */ + public List> selectCommentByBusinessKey(String businessKey); + /** * 根据条件流程Id查询操作日志 * @param procInsId diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsGroup.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsGroup.java index debcd368..beb7c864 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsGroup.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsGroup.java @@ -37,9 +37,12 @@ public class ProProjectInfoSubdeptsGroup extends BaseEntity private Long subDeptId; /** 单位类型 */ - @Excel(name = "单位类型") private String subDeptType; + /** 单位类型 */ + @Excel(name = "单位类型") + private String subDeptTypeName; + /** 分包单位名称 */ @Excel(name = "分包单位名称") private String subDeptName; @@ -60,10 +63,18 @@ public class ProProjectInfoSubdeptsGroup extends BaseEntity @Excel(name = "工种类型") private String craftType; + /** 工种类型 */ + @Excel(name = "工种类型") + private String craftTypeName; + /** 工种岗位 */ @Excel(name = "工种岗位") private String craftPost; + /** 工种岗位 */ + @Excel(name = "工种岗位") + private String craftPostName; + /** 负责人姓名 */ @Excel(name = "负责人姓名") private String groupLeaderName; @@ -312,6 +323,30 @@ public class ProProjectInfoSubdeptsGroup extends BaseEntity this.groupLeaderUserInfos = groupLeaderUserInfos; } + public String getCraftTypeName() { + return craftTypeName; + } + + public void setCraftTypeName(String craftTypeName) { + this.craftTypeName = craftTypeName; + } + + public String getCraftPostName() { + return craftPostName; + } + + public void setCraftPostName(String craftPostName) { + this.craftPostName = craftPostName; + } + + public String getSubDeptTypeName() { + return subDeptTypeName; + } + + public void setSubDeptTypeName(String subDeptTypeName) { + this.subDeptTypeName = subDeptTypeName; + } + @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/ProProjectInfoSubdeptsUsersMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoSubdeptsUsersMapper.java index 3fa3c781..3cf11c73 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoSubdeptsUsersMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoSubdeptsUsersMapper.java @@ -124,9 +124,42 @@ public interface ProProjectInfoSubdeptsUsersMapper */ public int editDefaultProjectById(Long id); + /** + * 查询用户电话 + * @param userPhone + * @return + */ public Map findUserPhone(String userPhone); + /** + * 查询用户电话 + * @param proId + * @param userPhone + * @return + */ + public Map findProUserPhone(@Param("proId")Long proId, @Param("userPhone")String userPhone); + + /** + * 修改用户电话 + * @param oldUserPhone + * @param newUserPhone + * @return + */ public int updateUserPhone(@Param("oldUserPhone")String oldUserPhone, @Param("newUserPhone")String newUserPhone); + /** + * 修改用户电话 + * @param oldUserPhone + * @param newUserPhone + * @return + */ public int updatePhone(@Param("oldUserPhone")String oldUserPhone, @Param("newUserPhone")String newUserPhone); + + /** + * 查询班组长列表 + * @param subDeptId + * @param craftPost + * @return + */ + public List> fileGroupLeaderUsers(@Param("subDeptId")Long subDeptId, @Param("craftPost")String craftPost); } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml index d839955d..0bd8c28f 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml @@ -34,11 +34,16 @@ + + + diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsGroupMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsGroupMapper.xml index 46c14564..fdc118b5 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsGroupMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsGroupMapper.xml @@ -12,12 +12,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -33,9 +36,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select psg.id, psg.com_id, sd.dept_name as com_name, psg.project_id, pi.project_name, psg.sub_dept_id, psg.sub_dept_type, psg.sub_dept_name, psg.sub_dept_code, psg.group_name, psg.group_code, psg.craft_type, psg.craft_post, psg.group_leader_name, psg.group_leader_code, psg.group_leader_phone, psg.use_status, psg.approve_status, psg.qr_code, psg.is_del, psg.create_by, psg.create_time, psg.update_by, psg.update_time, psg.remark from pro_project_info_subdepts_group psg + select psg.id, psg.com_id, sd.dept_name as com_name, psg.project_id, pi.project_name, psg.sub_dept_id, psg.sub_dept_type, dic0.dict_label as sub_dept_type_name, psg.sub_dept_name, psg.sub_dept_code, psg.group_name, psg.group_code, psg.craft_type, dic1.dict_label as craft_type_name, psg.craft_post, dic2.dict_label as craft_post_name, psg.group_leader_name, psg.group_leader_code, psg.group_leader_phone, psg.use_status, psg.approve_status, psg.qr_code, psg.is_del, psg.create_by, psg.create_time, psg.update_by, psg.update_time, psg.remark from pro_project_info_subdepts_group psg left join pro_project_info pi on pi.id = psg.project_id left join sys_dept sd on sd.dept_id = psg.com_id + left join sys_dict_data dic0 on psg.`sub_dept_type`=dic0.`dict_value` and dic0.`dict_type`='sub_dept_type' + left join sys_dict_data dic1 on psg.`craft_type`=dic1.`dict_value` and dic1.`dict_type`='pro_craft_type' + left join sys_dict_data dic2 on psg.`craft_post`=dic2.`dict_value` and dic2.`dict_type`='pro_craft_post' + + update sys_user set user_name = #{newUserPhone}, phonenumber = #{newUserPhone} where phonenumber = #{oldUserPhone} @@ -397,4 +402,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update pro_project_info_subdepts_users set user_phone = #{newUserPhone} where user_phone = #{oldUserPhone} + + \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java index bb705f98..93f0799f 100644 --- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java @@ -132,6 +132,16 @@ public class FlowBusinessKeyController extends BaseController { return success(flowBusinessKeyService.selectCommentByProcInsId(procInsId)); } + /** + * 根据业务Id查询操作日志 + * @param businessKey + * @return + */ + @GetMapping(value = "/findCommentByBusinessKey/{businessKey}") + public AjaxResult findCommentByBusinessKey(@PathVariable("businessKey") String businessKey) { + return success(flowBusinessKeyService.selectCommentByBusinessKey(businessKey)); + } + /** * 根据流程Id查询表单数据 * @param procInsId diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowBusinessKeyService.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowBusinessKeyService.java index da71103a..3b889055 100644 --- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowBusinessKeyService.java +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/IFlowBusinessKeyService.java @@ -32,6 +32,13 @@ public interface IFlowBusinessKeyService { */ public List> selectCommentByProcInsId(String procInsId); + /** + * 根据条件业务Id查询操作日志 + * @param businessKey + * @return + */ + public List> selectCommentByBusinessKey(String businessKey); + /** * 根据流程Id查询表单数据 * @param procInsId diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowBusinessKeyServiceImpl.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowBusinessKeyServiceImpl.java index 71a1caa3..26b60701 100644 --- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowBusinessKeyServiceImpl.java +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowBusinessKeyServiceImpl.java @@ -75,6 +75,16 @@ public class FlowBusinessKeyServiceImpl implements IFlowBusinessKeyService { return flowBusinessKeyMapper.selectCommentByProcInsId(procInsId); } + /** + * 根据条件业务Id查询操作日志 + * @param businessKey + * @return + */ + @Override + public List> selectCommentByBusinessKey(String businessKey){ + return flowBusinessKeyMapper.selectCommentByBusinessKey(businessKey); + } + /** * 根据流程Id查询表单数据 * @param procInsId diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowDefinitionServiceImpl.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowDefinitionServiceImpl.java index f369de9b..76d6e1e3 100644 --- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowDefinitionServiceImpl.java +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowDefinitionServiceImpl.java @@ -282,7 +282,7 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl if (Objects.isNull(task)) { return startProcessInstance(procDefId,variables); } - taskService.addComment(taskId, task.getProcessInstanceId(), FlowComment.NORMAL.getType(), userName+"提交流程申请！！"); + taskService.addComment(taskId, task.getProcessInstanceId(), FlowComment.NORMAL.getType(), userName+"重新提交流程申请！！"); taskService.complete(task.getId(), variables); return AjaxResult.success("流程重启成功"); } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsGroupController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsGroupController.java index c913f71c..3391da28 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsGroupController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsGroupController.java @@ -1,5 +1,6 @@ package com.yanzhu.manage.controller; +import com.yanzhu.common.core.utils.StringUtils; import com.yanzhu.common.core.utils.poi.ExcelUtil; import com.yanzhu.common.core.web.controller.BaseController; import com.yanzhu.common.core.web.domain.AjaxResult; @@ -7,15 +8,15 @@ import com.yanzhu.common.core.web.page.TableDataInfo; import com.yanzhu.common.log.annotation.Log; import com.yanzhu.common.log.enums.BusinessType; import com.yanzhu.common.security.annotation.RequiresPermissions; +import com.yanzhu.manage.domain.ProProjectInfoSubdepts; import com.yanzhu.manage.domain.ProProjectInfoSubdeptsGroup; import com.yanzhu.manage.service.IProProjectInfoSubdeptsGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; +import java.util.stream.Collectors; /** * 单位班组Controller @@ -133,6 +134,30 @@ public class ProProjectInfoSubdeptsGroupController extends BaseController return toAjax(proProjectInfoSubdeptsGroupService.deleteProProjectInfoSubdeptsGroupByIds(ids)); } + /** + * 统计参建单位列表 + */ + @GetMapping("/findWxList") + public TableDataInfo findWxList(ProProjectInfoSubdeptsGroup proProjectInfoSubdeptsGroup) + { + startPage(); + List list = proProjectInfoSubdeptsGroupService.selectProProjectInfoSubdeptsGroupList(proProjectInfoSubdeptsGroup); + if(StringUtils.isNotEmpty(list)){ + // 根据单位对班组进行分组 + Map> groupedList = list.stream() + .collect(Collectors.groupingBy(ProProjectInfoSubdeptsGroup::getSubDeptName)); + List> dataList = new ArrayList<>(); + groupedList.forEach((subDeptName, datas) -> { + Map data = new HashMap<>(); + data.put("subDepts",subDeptName); + data.put("groupList",datas); + dataList.add(data); + }); + return getDataTable(dataList); + } + return getDataTable(list); + } + /** * 统计参建单位列表 */ diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java index 5051aeed..0c31b324 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java @@ -142,16 +142,16 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController public AjaxResult registerSubDeptsUsers(@RequestBody ProProjectInfoSubdeptsUsers ProProjectInfoSubdeptsUsers) { if(Objects.isNull(ProProjectInfoSubdeptsUsers.getId())){ - return success(proProjectInfoSubdeptsUsersService.insertProProjectInfoSubdeptsUsersWX(ProProjectInfoSubdeptsUsers,true)); + return success(proProjectInfoSubdeptsUsersService.insertProProjectInfoSubdeptsUsers(ProProjectInfoSubdeptsUsers)); }else{ - return success(proProjectInfoSubdeptsUsersService.updateProProjectInfoSubdeptsUsersWX(ProProjectInfoSubdeptsUsers,true)); + return success(proProjectInfoSubdeptsUsersService.updateProProjectInfoSubdeptsUsers(ProProjectInfoSubdeptsUsers)); } } /** * 变更手机号码 + * @RequiresPermissions("manage:proProjectInfoSubdeptsUsers:editPhone") */ - @RequiresPermissions("manage:proProjectInfoSubdeptsUsers:editPhone") @Log(title = "变更手机号", businessType = BusinessType.UPDATE) @PostMapping("/editPhone") public AjaxResult editPhone(@RequestBody ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers) @@ -266,6 +266,22 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController proProjectInfoSubdeptsUsersService.updateApproveStatus(proUserId); } + /** + * 修改人员进场状态 + * @param id + * @param status + * @return + * @RequiresPermissions("manage:proProjectInfoSubdeptsUsers:edit") + */ + @PostMapping("/editUseStatus/{id}") + public AjaxResult editUseStatus(@PathVariable("id") Long id, String status){ + try { + return AjaxResult.success(proProjectInfoSubdeptsUsersService.editUseStatus(id,status)); + }catch (Exception ex){ + return AjaxResult.error(ex.getMessage()); + } + } + /** * 修改人员进场状态 * @param ids @@ -277,16 +293,7 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController public AjaxResult updateEnterState(@RequestBody List ids,@PathVariable int state){ try { for (Long id : ids) { - ProProjectInfoSubdeptsUsers user = proProjectInfoSubdeptsUsersService.selectProProjectInfoSubdeptsUsersById(id); - if(Objects.nonNull(user)) { - if (state == 0) {//进场 - uniService.syncUserAuthDevice(id); - } else { - uniService.syncUserRevoke(id); - } - user.setUseStatus(Convert.toStr(state)); - proProjectInfoSubdeptsUsersService.updateProProjectInfoSubdeptsUsers(user); - } + proProjectInfoSubdeptsUsersService.editUseStatus(id,Convert.toStr(state)); } return AjaxResult.success(); }catch (Exception ex){ @@ -338,6 +345,15 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController return success(); } + /** + * 查询班组长列表 + */ + @GetMapping("/fileGroupLeaderUsers/{subDeptId}") + public AjaxResult fileGroupLeaderUsers(@PathVariable("subDeptId") Long subDeptId,String craftPost) + { + return success(proProjectInfoSubdeptsUsersService.fileGroupLeaderUsers(subDeptId,craftPost)); + } + /** * 查询分包单位工人列表 */ @@ -472,6 +488,39 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController return success(datas); } + /** + * 统计参建单位列表 + */ + @GetMapping("/findWxList") + public TableDataInfo findWxList(ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers) + { + startPage(); + List list = proProjectInfoSubdeptsUsersService.selectProProjectInfoSubdeptsUsersList(proProjectInfoSubdeptsUsers); + if(StringUtils.isNotEmpty(list)){ + // 根据单位对班组进行分组 + Map> deptsedList = list.stream() + .collect(Collectors.groupingBy(ProProjectInfoSubdeptsUsers::getSubDeptName)); + List> dataList = new ArrayList<>(); + deptsedList.forEach((subDeptName, datas) -> { + Map deptData = new HashMap<>(); + deptData.put("subDeptName",subDeptName); + Map> groupedList = datas.stream() + .collect(Collectors.groupingBy(ProProjectInfoSubdeptsUsers::getSubDeptGroupName)); + List> groupList = new ArrayList<>(); + groupedList.forEach((subDeptGroupName, users) -> { + Map groupData = new HashMap<>(); + groupData.put("subDeptGroupName",subDeptGroupName); + groupData.put("users",users); + groupList.add(groupData); + }); + deptData.put("groups",groupList); + dataList.add(deptData); + }); + return getDataTable(dataList); + } + return getDataTable(list); + } + /** * 统计参建单位列表 */ diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java index 180c192c..53aa65ca 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java @@ -71,6 +71,14 @@ public interface IProProjectInfoSubdeptsUsersService */ public int updateProProjectInfoSubdeptsUsers(ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers); + /** + * 修改人员入场/离场状态 + * @param id + * @param status + * @return + */ + public int editUseStatus(Long id, String status); + /** * 变更手机号码 * @@ -222,4 +230,12 @@ public interface IProProjectInfoSubdeptsUsersService * @param id */ void fileSign(Long id); + + /** + * 查询班组长列表 + * @param subDeptId + * @param craftPost + * @return + */ + List> fileGroupLeaderUsers(Long subDeptId,String craftPost); } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java index 521595c9..7d18fc15 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java @@ -357,16 +357,19 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu oldQuery.setUserPhone(entiry.getGroupLeaderPhone()); List dataList = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(oldQuery); ProProjectInfoSubdeptsUsers oldUser = dataList.get(0); - oldUser.setUserPost(UserPostEnums.LWGR.getCode()); - oldUser.setQrCode(""); - proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(oldUser); - try { - SysUser sysUser = new SysUser(); - sysUser.setUserName(entiry.getGroupLeaderPhone()); - sysUser.setDeptId(proProjectInfoSubdeptsGroup.getProjectId()); - remoteUserService.removeUserRoles(sysUser, SecurityConstants.INNER); - }catch (Exception e){ - e.printStackTrace(); + //旧班组的用户为班组长时才修改... + if(Objects.equals(oldUser.getUserPost(),UserPostEnums.BZZ.getCode())){ + oldUser.setUserPost(UserPostEnums.LWGR.getCode()); + oldUser.setQrCode(""); + proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(oldUser); + try { + SysUser sysUser = new SysUser(); + sysUser.setUserName(entiry.getGroupLeaderPhone()); + sysUser.setDeptId(proProjectInfoSubdeptsGroup.getProjectId()); + remoteUserService.removeUserRoles(sysUser, SecurityConstants.INNER); + }catch (Exception e){ + e.printStackTrace(); + } } } ProProjectInfoSubdeptsUsers query = new ProProjectInfoSubdeptsUsers(); @@ -374,47 +377,52 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu query.setSubDeptId(proProjectInfoSubdeptsGroup.getSubDeptId()); query.setUserPhone(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); List dataList = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(query); - ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = dataList.get(0); - entiry.setGroupLeaderName(proProjectInfoSubdeptsUsers.getUserName()); - entiry.setGroupLeaderCode(proProjectInfoSubdeptsUsers.getCardCode()); - entiry.setGroupLeaderPhone(proProjectInfoSubdeptsUsers.getUserPhone()); - entiry.setUpdateBy(SecurityUtils.getUsername()); - entiry.setUpdateTime(DateUtils.getNowDate()); - res = proProjectInfoSubdeptsGroupMapper.updateProProjectInfoSubdeptsGroup(entiry); - if(res > 0){ - proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.BZZ.getCode()); - proProjectInfoSubdeptsUsers.setSubDeptGroup(entiry.getId()); - proProjectInfoSubdeptsUsers.setSubDeptGroupName(entiry.getGroupName()); - // 设置班组长二维码信息... - try { - //String accessToken = wxMaService.getAccessToken(); - String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; - String savePath = ProfileConfig.profilePath+"/"+filePath; - String profilePath = ProfileConfig.profile+"/"+filePath; - // 生成二维码 - File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=4&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280); - FileUtil.copyFile(file,new File(savePath)); - proProjectInfoSubdeptsUsers.setQrCode(profilePath); - proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); - }catch (Exception e){ - log.error(e.getMessage()); - } - // 修改用户角色信息 - try { - SysUser sysUser = new SysUser(); - sysUser.setComId(proProjectInfoSubdeptsUsers.getComId()); - sysUser.setDeptId(proProjectInfoSubdeptsUsers.getProjectId()); - sysUser.setUserName(entiry.getGroupLeaderPhone()); - sysUser.setUserType(UserTypeEnums.FBBZZZ.getCode()); - sysUser.setNickName(entiry.getGroupLeaderName()); - sysUser.setPhonenumber(entiry.getGroupLeaderPhone()); - sysUser.setUpdateBy(SecurityUtils.getUsername()); - sysUser.setUpdateTime(DateUtils.getNowDate()); - sysUser.setRemark(entiry.getSubDeptName()); - sysUser.setActiveProjectId(entiry.getProjectId()); - remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER); - }catch (Exception e){ - e.printStackTrace(); + if(StringUtils.isNotEmpty(dataList)){ + ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = dataList.get(0); + entiry.setGroupLeaderName(proProjectInfoSubdeptsUsers.getUserName()); + entiry.setGroupLeaderCode(proProjectInfoSubdeptsUsers.getCardCode()); + entiry.setGroupLeaderPhone(proProjectInfoSubdeptsUsers.getUserPhone()); + entiry.setUpdateBy(SecurityUtils.getUsername()); + entiry.setUpdateTime(DateUtils.getNowDate()); + res = proProjectInfoSubdeptsGroupMapper.updateProProjectInfoSubdeptsGroup(entiry); + if(res > 0){ + // 角色冲突...这里只能将劳务人员设置为班组长 + if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.LWGR.getCode()) || Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.TSGZ.getCode())){ + proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.BZZ.getCode()); + proProjectInfoSubdeptsUsers.setSubDeptGroup(entiry.getId()); + proProjectInfoSubdeptsUsers.setSubDeptGroupName(entiry.getGroupName()); + // 设置班组长二维码信息... + try { + //String accessToken = wxMaService.getAccessToken(); + String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; + String savePath = ProfileConfig.profilePath+"/"+filePath; + String profilePath = ProfileConfig.profile+"/"+filePath; + // 生成二维码 + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=4&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280); + FileUtil.copyFile(file,new File(savePath)); + proProjectInfoSubdeptsUsers.setQrCode(profilePath); + proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); + }catch (Exception e){ + log.error(e.getMessage()); + } + // 修改用户角色信息 + try { + SysUser sysUser = new SysUser(); + sysUser.setComId(proProjectInfoSubdeptsUsers.getComId()); + sysUser.setDeptId(proProjectInfoSubdeptsUsers.getProjectId()); + sysUser.setUserName(entiry.getGroupLeaderPhone()); + sysUser.setUserType(UserTypeEnums.FBBZZZ.getCode()); + sysUser.setNickName(entiry.getGroupLeaderName()); + sysUser.setPhonenumber(entiry.getGroupLeaderPhone()); + sysUser.setUpdateBy(SecurityUtils.getUsername()); + sysUser.setUpdateTime(DateUtils.getNowDate()); + sysUser.setRemark(entiry.getSubDeptName()); + sysUser.setActiveProjectId(entiry.getProjectId()); + remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER); + }catch (Exception e){ + e.printStackTrace(); + } + } } } } @@ -437,7 +445,17 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu proProjectInfoSubdeptsGroup.setUpdateTime(DateUtils.getNowDate()); // 离场时所有人员全部离场 if(Objects.equals(UseStateEnums.OUT.getCode(), status)){ + ProProjectInfoSubdeptsUsers userQuery = new ProProjectInfoSubdeptsUsers(); + userQuery.setUseStatus(UseStateEnums.IN.getCode()); + userQuery.setSubDeptId(proProjectInfoSubdeptsGroup.getSubDeptId()); + userQuery.setSubDeptGroup(proProjectInfoSubdeptsGroup.getId()); + List users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery); proProjectInfoSubdeptsUsersMapper.updateUseStatusByParams(proProjectInfoSubdeptsGroup.getSubDeptId(),proProjectInfoSubdeptsGroup.getId()); + if(users.size()>0){ + for(ProProjectInfoSubdeptsUsers user:users){ + uniService.syncUserRevoke(user.getId()); + } + } } return proProjectInfoSubdeptsGroupMapper.updateProProjectInfoSubdeptsGroup(proProjectInfoSubdeptsGroup); }else{ diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java index 1ed3df2c..501a6143 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java @@ -250,9 +250,9 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept } proProjectInfoSubdepts.setComId(info.getComId()); if(Objects.equals(proProjectInfoSubdepts.getSubDeptType(), SubDeptsEnums.ZYFB.getCode()) || Objects.equals(proProjectInfoSubdepts.getSubDeptType(),SubDeptsEnums.LWFB.getCode())){ - Map map = proProjectInfoSubdeptsUsersMapper.findUserPhone(proProjectInfoSubdepts.getSubDeptLeaderPhone()); + Map map = proProjectInfoSubdeptsUsersMapper.findProUserPhone(info.getId(),proProjectInfoSubdepts.getSubDeptLeaderPhone()); if(Objects.nonNull(map) && Convert.toInt(map.get("total"),0)>0){ - throw new ServiceException("手机号码已被注册"); + throw new ServiceException("手机号码已存在"); } // 单位委托人信息 if(StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderPhone())){ @@ -554,8 +554,17 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept proProjectInfoSubdepts.setUpdateTime(DateUtils.getNowDate()); // 离场时所有班组/人员全部离场 if(Objects.equals(UseStateEnums.OUT.getCode(), status)){ + ProProjectInfoSubdeptsUsers userQuery = new ProProjectInfoSubdeptsUsers(); + userQuery.setUseStatus(UseStateEnums.IN.getCode()); + userQuery.setSubDeptId(proProjectInfoSubdepts.getId()); + List users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery); proProjectInfoSubdeptsGroupMapper.updateUseStatusByParams(proProjectInfoSubdepts.getId()); proProjectInfoSubdeptsUsersMapper.updateUseStatusByParams(proProjectInfoSubdepts.getId(),null); + if(users.size()>0){ + for(ProProjectInfoSubdeptsUsers user:users){ + uniService.syncUserRevoke(user.getId()); + } + } } return proProjectInfoSubdeptsMapper.updateProProjectInfoSubdepts(proProjectInfoSubdepts); }else{ diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java index f20df94e..a73ac802 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java @@ -145,7 +145,14 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu @Override public int insertProProjectInfoSubdeptsUsers(ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers) { + if(StringUtils.isEmpty(proProjectInfoSubdeptsUsers.getCardType())){ + proProjectInfoSubdeptsUsers.setCardType("1"); + } + if(StringUtils.isEmpty(proProjectInfoSubdeptsUsers.getUserSex())){ + proProjectInfoSubdeptsUsers.setUserSex(StringUtils.judgeGender(proProjectInfoSubdeptsUsers.getCardCode())); + } proProjectInfoSubdeptsUsers.setUseStatus(UseStateEnums.IN.getCode()); + proProjectInfoSubdeptsUsers.setUseDate(DateUtils.getNowDate()); proProjectInfoSubdeptsUsers.setCreateBy(SecurityUtils.getUsername()); proProjectInfoSubdeptsUsers.setCreateTime(DateUtils.getNowDate()); proProjectInfoSubdeptsUsers.setSubStep(2L); @@ -153,6 +160,9 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu // 参建单位信息 ProProjectInfoSubdepts subDepts = proProjectInfoSubdeptsMapper.selectProProjectInfoSubdeptsById(proProjectInfoSubdeptsUsers.getSubDeptId()); + if(proProjectInfoSubdeptsUsers.getComId()==null){ + proProjectInfoSubdeptsUsers.setComId(subDepts.getComId()); + } proProjectInfoSubdeptsUsers.setSubDeptType(subDepts.getSubDeptType()); SysUser sysUser = new SysUser(); @@ -181,15 +191,19 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu //判断工种岗位设置用户岗位...PC需要单独设置 if(Objects.equals(proProjectInfoSubdeptsUsers.getCraftPost(), CraftPostEnums.WTDL.getCode())){ sysUser.setUserType(UserTypeEnums.FBWTDL.getCode()); + proProjectInfoSubdeptsUsers.setCraftType(CraftTypeEnums.GLRY.getCode()); proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.WTDL.getCode()); }else if(Objects.equals(proProjectInfoSubdeptsUsers.getCraftPost(), CraftPostEnums.XMJL.getCode())){ sysUser.setUserType(UserTypeEnums.FBXMJL.getCode()); + proProjectInfoSubdeptsUsers.setCraftType(CraftTypeEnums.GLRY.getCode()); proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.XMJL.getCode()); }else if(Objects.equals(proProjectInfoSubdeptsUsers.getCraftPost(), CraftPostEnums.AQZY.getCode())){ sysUser.setUserType(UserTypeEnums.FBAQRY.getCode()); + proProjectInfoSubdeptsUsers.setCraftType(CraftTypeEnums.GLRY.getCode()); proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.AQRY.getCode()); }else if(Objects.equals(proProjectInfoSubdeptsUsers.getCraftPost(), CraftPostEnums.CLZY.getCode())){ sysUser.setUserType(UserTypeEnums.FBXMJL.getCode()); + proProjectInfoSubdeptsUsers.setCraftType(CraftTypeEnums.GLRY.getCode()); proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.CLRY.getCode()); }else{ sysUser.setUserType(UserTypeEnums.FBLWRY.getCode()); @@ -335,9 +349,9 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu if(Objects.isNull(parUsers)){ throw new ServiceException("用户信息异常...请重新扫码"); } - Map map = proProjectInfoSubdeptsUsersMapper.findUserPhone(proProjectInfoSubdeptsUsers.getUserPhone()); + Map map = proProjectInfoSubdeptsUsersMapper.findProUserPhone(parUsers.getProjectId(),proProjectInfoSubdeptsUsers.getUserPhone()); if(Objects.nonNull(map) && Convert.toInt(map.get("total"),0)>0){ - throw new ServiceException("手机号码已被注册"); + throw new ServiceException("手机号码已存在"); } proProjectInfoSubdeptsUsers.setComId(parUsers.getComId()); proProjectInfoSubdeptsUsers.setProjectId(parUsers.getProjectId()); @@ -620,11 +634,12 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER).getData(); ProProjectInfoSubdeptsUsers old = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(proProjectInfoSubdeptsUsers.getId()); - proProjectInfoSubdeptsUsers.setUpdateBy(SecurityUtils.getUsername()); - proProjectInfoSubdeptsUsers.setUpdateTime(DateUtils.getNowDate()); + proProjectInfoSubdeptsUsers.setUserId(old.getUserId()); + proProjectInfoSubdeptsUsers.setQrCode(old.getQrCode()); proProjectInfoSubdeptsUsers.setAdmitGuid(old.getAdmitGuid()); proProjectInfoSubdeptsUsers.setFaceGuid(old.getFaceGuid()); - proProjectInfoSubdeptsUsers.setUserId(old.getUserId()); + proProjectInfoSubdeptsUsers.setUpdateBy(SecurityUtils.getUsername()); + proProjectInfoSubdeptsUsers.setUpdateTime(DateUtils.getNowDate()); /** * 考勤需要信息改变时推送信息... @@ -637,34 +652,71 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu if(!Objects.equals(old.getUserPost(),proProjectInfoSubdeptsUsers.getUserPost())){ String userPost = proProjectInfoSubdeptsUsers.getUserPost(); if(Objects.equals(UserPostEnums.WTDL.getCode(),userPost) || Objects.equals(UserPostEnums.XMJL.getCode(),userPost) || Objects.equals(UserPostEnums.BZZ.getCode(),userPost)){ - // 生成二维码 - try { - String accessToken = wxMaService.getAccessToken(); - String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; - String savePath = ProfileConfig.profilePath+"/"+filePath; - String profilePath = ProfileConfig.profile+"/"+filePath; - log.info("accessToken...{}",accessToken); + if(!Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),old.getUserPost()) || StringUtils.isEmpty(proProjectInfoSubdeptsUsers.getQrCode())){ // 生成二维码 - if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.WTDL.getCode())){ - File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=2&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280); - FileUtil.copyFile(file,new File(savePath)); - }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.XMJL.getCode())){ - File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=3&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280); - FileUtil.copyFile(file,new File(savePath)); - }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.BZZ.getCode())){ - File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=4&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280); - FileUtil.copyFile(file,new File(savePath)); + try { + String accessToken = wxMaService.getAccessToken(); + String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; + String savePath = ProfileConfig.profilePath+"/"+filePath; + String profilePath = ProfileConfig.profile+"/"+filePath; + log.info("accessToken...{}",accessToken); + // 生成二维码 + if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.WTDL.getCode())){ + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=2&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280); + FileUtil.copyFile(file,new File(savePath)); + }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.XMJL.getCode())){ + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=3&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280); + FileUtil.copyFile(file,new File(savePath)); + }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.BZZ.getCode())){ + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=4&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280); + FileUtil.copyFile(file,new File(savePath)); + } + proProjectInfoSubdeptsUsers.setQrCode(profilePath); + return proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); + }catch (Exception e){ + log.error(e.getMessage()); } - proProjectInfoSubdeptsUsers.setQrCode(profilePath); - return proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); - }catch (Exception e){ - log.error(e.getMessage()); } } } return proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); } + /** + * 修改人员入场/离场状态 + * @param id + * @param status + * @return + */ + public int editUseStatus(Long id, String status){ + ProProjectInfoSubdeptsUsers user = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(id); + if (Objects.equals(UseStateEnums.IN.getCode(),status)) { + //进场 + uniService.syncUserAuthDevice(id); + //判断班组是否入场 + if(user.getSubDeptGroup()!=null){ + ProProjectInfoSubdeptsGroup proProjectInfoSubdeptsGroup = proProjectInfoSubdeptsGroupMapper.selectProProjectInfoSubdeptsGroupById(user.getSubDeptGroup()); + if(proProjectInfoSubdeptsGroup!=null && Objects.equals(UseStateEnums.OUT.getCode(),proProjectInfoSubdeptsGroup.getUseStatus())){ + proProjectInfoSubdeptsGroup.setUseStatus(status); + proProjectInfoSubdeptsGroupMapper.updateProProjectInfoSubdeptsGroup(proProjectInfoSubdeptsGroup); + } + } + //判断班组是否入场 + if(user.getSubDeptId()!=null){ + ProProjectInfoSubdepts proProjectInfoSubdepts = proProjectInfoSubdeptsMapper.selectProProjectInfoSubdeptsById(user.getSubDeptId()); + if(proProjectInfoSubdepts!=null && Objects.equals(UseStateEnums.OUT.getCode(),proProjectInfoSubdepts.getUseStatus())){ + proProjectInfoSubdepts.setUseStatus(status); + proProjectInfoSubdeptsMapper.updateProProjectInfoSubdepts(proProjectInfoSubdepts); + } + } + } else { + //离场 + uniService.syncUserRevoke(id); + } + user.setUseStatus(status); + return proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(user); + } + /** * 变更手机号码 * @@ -1613,4 +1665,15 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu } } + /** + * 查询班组长列表 + * @param subDeptId + * @param craftPost + * @return + */ + @Override + public List> fileGroupLeaderUsers(Long subDeptId,String craftPost){ + return proProjectInfoSubdeptsUsersMapper.fileGroupLeaderUsers(subDeptId,craftPost); + } + } diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java index 08432344..ff52bd40 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java @@ -345,6 +345,18 @@ public class SysUserController extends BaseController { return toAjax(userService.insertUser(user)); } + /** + * 新增用户 + */ + @RequiresPermissions("system:user:add") + @Log(title = "用户管理", businessType = BusinessType.INSERT) + @PostMapping("/addUser") + public AjaxResult addUser(@Validated @RequestBody SysUser user) { + user.setCreateBy(SecurityUtils.getUsername()); + user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); + return toAjax(userService.insertUserWx(user)); + } + @GetMapping("/getUserByName/{userName}") @RequiresPermissions("system:user:query") public AjaxResult getUserByName(@PathVariable(value = "userName", required = true)String userName) { diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserService.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserService.java index d2d97dfc..1f98d375 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserService.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysUserService.java @@ -149,6 +149,14 @@ public interface ISysUserService */ public int insertUser(SysUser user); + /** + * 新增用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int insertUserWx(SysUser user); + /** * 注册用户信息 * diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java index 9f5c1bfd..16483b06 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java @@ -418,6 +418,80 @@ public class SysUserServiceImpl implements ISysUserService return rows; } + /** + * 新增用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int insertUserWx(SysUser user){ + // 新增用户信息 + int rows=0; + SysUser sysUser = userMapper.selectByPhone(user.getPhonenumber()); + if(Objects.nonNull(sysUser)){ + // 此电话号码已注册 + user.setUserId(sysUser.getUserId()); + user.setIsActive(0l); + user.setStatus("0"); + SysUserCom comWhere=new SysUserCom(); + comWhere.setUserId(sysUser.getUserId()); + comWhere.setComId(user.getComId()); + List userComs= userComMapper.selectUserComs(comWhere); + if(userComs.size()==0){ + userMapper.insertUserCom(user); + } + if(StringUtils.isEmpty(sysUser.getUserName())){ + sysUser.setUserName(userNameAndCout(sysUser.getNickName())); + } + sysUser.setComId(user.getComId()); + sysUser.setDeptId(user.getDeptId()); + sysUser.setPhonenumber(user.getPhonenumber()); + sysUser.setNickName(user.getNickName()); + sysUser.setUpdateBy(user.getUpdateBy()); + sysUser.setUpdateTime(user.getUpdateTime()); + rows=userMapper.updateUser(sysUser); + userExtService.updateBySysUser(sysUser); + }else{ + //此电话号码未注册 + if(StringUtils.isEmpty(user.getUserName())){ + user.setUserName(userNameAndCout(user.getNickName())); + } + user.setCreateBy(user.getUpdateBy()); + user.setCreateTime(user.getUpdateTime()); + if(StringUtils.isEmpty(user.getUserType())) { + user.setUserType(UserTypeEnums.XMRY.getCode()); + } + rows=userMapper.insertUser(user); + user.setIsActive(1l); + userMapper.insertUserCom(user); + userExtService.updateBySysUser(user); + } + // 新增用户岗位关联 + insertUserPost(user); + // 新增用户与角色管理 + SysUserRole userRole = new SysUserRole(); + userRole.setUserId(user.getUserId()); + userRole.setDeptId(user.getDeptId()); + userRoleMapper.deleteUserRoleByUserRole(userRole); + List roleList = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.JSDWRY.getKeys()+"_"+user.getDeptId()); + if(roleList.size()>0){ + // 使用 Stream 来提取 roleId 并转换成一个数组 + Long[] roleIds = roleList.stream() + .map(SysRole::getRoleId) + .toArray(Long[]::new); + user.setRoleIds(roleIds); + insertUserRole(user); + } + try { + SysDept sysDept = deptMapper.selectDeptById(user.getDeptId()); + Map data = packageSubDeptUsers(user, sysDept); + remoteProService.syspushSubDeptsUser(data, SecurityConstants.INNER); + }catch (Exception e){ + e.printStackTrace(); + } + return rows; + } + /** * 组装入场信息 * @param user diff --git a/yanzhu-ui-app/miniprogram/api/project.js b/yanzhu-ui-app/miniprogram/api/project.js index 03534cce..d85bccf8 100644 --- a/yanzhu-ui-app/miniprogram/api/project.js +++ b/yanzhu-ui-app/miniprogram/api/project.js @@ -126,7 +126,7 @@ export function subdeptsList(query) { }) } -// 统计参建单位列表 +// 统计参建单位信息 export function subdeptsCount(query) { return request({ url: '/manage/proProjectInfoSubdepts/findWxCount', @@ -143,3 +143,133 @@ export function registerSubDeptsGL(data) { data: data }) } + +// 修改参建单位入场状态 +export function editSubDeptsUseStatus(id,status) { + return request({ + url: '/manage/proProjectInfoSubdepts/editUseStatus/'+id+'?status='+status, + method: 'get' + }) +} + +// 查询单位班组列表 +export function findSubGroupsList(query) { + return request({ + url: '/manage/proProjectInfoSubdeptsGroup/list', + method: 'get', + params: query + }) +} + +// 查询单位班组列表 +export function subgroupsList(query) { + return request({ + url: '/manage/proProjectInfoSubdeptsGroup/findWxList', + method: 'get', + params: query + }) +} + +// 统计单位班组信息 +export function subgroupsCount(query) { + return request({ + url: '/manage/proProjectInfoSubdeptsGroup/findWxCount', + method: 'get', + params: query + }) +} + +// 查看单位班组详情 +export function findSubdeptsGroupById(id) { + return request({ + url: '/manage/proProjectInfoSubdeptsGroup/'+id, + method: 'get' + }) +} + +// 修改单位班组入场状态 +export function editSubGroupsUseStatus(id,status) { + return request({ + url: '/manage/proProjectInfoSubdeptsGroup/editUseStatus/'+id+'?status='+status, + method: 'get' + }) +} + +// 查看可选班组长列表 +export function fileGroupLeaderUsers(subDeptId,craftPost) { + return request({ + url: '/manage/proProjectInfoSubdeptsUsers/fileGroupLeaderUsers/'+subDeptId+'?craftPost='+craftPost, + method: 'get' + }) +} + +// 确认变更班组长信息 +export function updateGroupLeader(data) { + return request({ + url: '/manage/proProjectInfoSubdeptsGroup/updateGroupLeader', + method: 'post', + data: data + }) +} + +// 管理人员新增单位班组信息 +export function registerSubDeptsGroupGL(data) { + return request({ + url: '/manage/proProjectInfoSubdeptsGroup/registerSubDeptsGroup', + method: 'post', + data: data + }) +} + +// 查询班组人员列表 +export function subusersList(query) { + return request({ + url: '/manage/proProjectInfoSubdeptsUsers/findWxList', + method: 'get', + params: query + }) +} + +// 统计班组人员信息 +export function subusersCount(query) { + return request({ + url: '/manage/proProjectInfoSubdeptsUsers/findWxCount', + method: 'get', + params: query + }) +} + +// 管理人员新增班组人员信息 +export function registerSubUsersGL(data) { + return request({ + url: '/manage/proProjectInfoSubdeptsUsers/registerSubDeptsUsers', + method: 'post', + data: data + }) +} + +// 查询班组人员详情 +export function findProSubUsersInfoById(id) { + return request({ + url: '/manage/proProjectInfoSubdeptsUsers/'+id, + method: 'get' + }) +} + +// 修改班组人员入场状态 +export function editSubUsersUseStatus(id,status) { + return request({ + url: '/manage/proProjectInfoSubdeptsUsers/editUseStatus/'+id+'?status='+status, + method: 'get' + }) +} + +// 修改班组人员手机号码 +export function editSubUsersPhone(data) { + return request({ + url: '/manage/proProjectInfoSubdeptsUsers/editPhone', + method: 'post', + data: data + }) +} + diff --git a/yanzhu-ui-app/miniprogram/app.json b/yanzhu-ui-app/miniprogram/app.json index 641b7519..94f6bdaa 100644 --- a/yanzhu-ui-app/miniprogram/app.json +++ b/yanzhu-ui-app/miniprogram/app.json @@ -32,7 +32,10 @@ "pages/project_subgroups/info/index", "pages/project_subusers/list/index", "pages/project_subusers/add/index", - "pages/project_subusers/info/index" + "pages/project_subusers/info/index", + "pages/project_magusers/list/index", + "pages/project_magusers/add/index", + "pages/project_magusers/info/index" ], "usingComponents": { "van-row": "@vant/weapp/row", diff --git a/yanzhu-ui-app/miniprogram/app.wxss b/yanzhu-ui-app/miniprogram/app.wxss index e996d8f0..e41810a0 100644 --- a/yanzhu-ui-app/miniprogram/app.wxss +++ b/yanzhu-ui-app/miniprogram/app.wxss @@ -1480,6 +1480,10 @@ swiper-item video { color: #45affb; } +.color_delete { + color: #ff6d6d; +} + .color_purple { color: #89a3ee; } @@ -1934,7 +1938,7 @@ swiper-item video { } .code_label_red { - background: red; + background: #ff6d6d; color: #FFFFFF; } @@ -2039,3 +2043,14 @@ swiper-item video { overflow: hidden; word-break: break-all; } + +.inspect_input_fill_out { + height: 90rpx; + background: #a2303042; + border-radius: 10rpx; + padding: 0 30rpx; +} + +.txtb{ + font-weight: 600; +} diff --git a/yanzhu-ui-app/miniprogram/pages/components/voucher-select/index.js b/yanzhu-ui-app/miniprogram/pages/components/voucher-select/index.js index cdf5df5b..1cf131b1 100644 --- a/yanzhu-ui-app/miniprogram/pages/components/voucher-select/index.js +++ b/yanzhu-ui-app/miniprogram/pages/components/voucher-select/index.js @@ -4,86 +4,95 @@ Component({ * 组件的属性列表 */ properties: { - columns:{ - type:Array + columns: { + type: Array }, - placeholder:{ - type:String + placeholder: { + type: String }, - selectValue:{ - type:String + selectValue: { + type: String }, - selectIndex:{ - type:String + selectIndex: { + type: String }, - background:{ - type:String + background: { + type: String }, - value:{ - type:String, - value:"" + value: { + type: String, + value: "" } }, /**数据监听 */ observers: { - columns: function (val) { - if(val.length > 0) { + columns: function (vals) { + if(vals.length>0){ this.setData({ - item:val[0], - value:val[0].text + item: [] }) - } else { + let _vals = this.data.value; + if(_vals!='' && typeof _vals === 'number'){ + for (let i = 0; i < vals.length; i++) { + if (_vals == columns[i].id) { + this.setData({ + value: columns[i].text + }) + break; + } + } + } + }else{ this.setData({ - item:[], - value:'' + item: [], + value: '' }) } + }, - selectValue:function(val){ + selectValue: function (val) { let columns = this.data.columns; - if(val && columns){ - for(let i=0;i { if (idx == 1 && (item.commentType == "3" || item.commentType == "2")) { - that.setData({ + this.setData({ rejectNode: true }) } diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml index bc918ce9..7b5179fd 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml @@ -24,9 +24,9 @@ - {{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}} + {{(flowRecordList.length-index) < 10 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}} {{item.taskName}} - {{item.commentResult}} + {{item.commentResult}} {{item.commentResult}} {{item.commentResult}} {{item.commentResult}} diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.js b/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.js index 887bb1dc..68d659c8 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.js @@ -26,7 +26,7 @@ Page({ subDeptInfos: {} }, subDeptUserData: { - user: {}, + userInfos: {}, }, stopShow: false, deleteShow: false, @@ -47,8 +47,8 @@ Page({ options: options }) this.findFlowNodes(); - this.findCommentByProcInsId(); this.findApplyDataInfo(); + this.findCommentByProcInsId(); }, //查询工作流节点 @@ -90,7 +90,7 @@ Page({ let list = []; res.data.forEach((item, idx) => { if (idx == 1 && (item.commentType == "3" || item.commentType == "2")) { - that.setData({ + this.setData({ rejectNode: true }) } diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml index e87b7513..a421e587 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml @@ -24,9 +24,9 @@ - {{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}} + {{(flowRecordList.length-index) < 10 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}} {{item.taskName}} - {{item.commentResult}} + {{item.commentResult}} {{item.commentResult}} {{item.commentResult}} {{item.commentResult}} diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/editTask/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/editTask/index.wxml index 65e01501..3d11923e 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/editTask/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/editTask/index.wxml @@ -25,7 +25,7 @@ - {{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}} + {{(flowRecordList.length-index) < 10 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}} {{item.taskName}} {{item.commentResult}} {{item.commentResult}} diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.js b/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.js new file mode 100644 index 00000000..64c6e9e3 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.js @@ -0,0 +1,66 @@ +// pages/project_magusers/add/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.json b/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.json new file mode 100644 index 00000000..3928faa4 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.wxml new file mode 100644 index 00000000..ce357575 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.wxml @@ -0,0 +1,2 @@ + +pages/project_magusers/add/index.wxml \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.wxss b/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.wxss new file mode 100644 index 00000000..3c7918b7 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.wxss @@ -0,0 +1 @@ +/* pages/project_magusers/add/index.wxss */ \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.js b/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.js new file mode 100644 index 00000000..89c50b14 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.js @@ -0,0 +1,66 @@ +// pages/project_magusers/info/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.json b/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.json new file mode 100644 index 00000000..3928faa4 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.wxml new file mode 100644 index 00000000..16b82b9b --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.wxml @@ -0,0 +1,2 @@ + +pages/project_magusers/info/index.wxml \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.wxss b/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.wxss new file mode 100644 index 00000000..902e5e7a --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.wxss @@ -0,0 +1 @@ +/* pages/project_magusers/info/index.wxss */ \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.js b/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.js new file mode 100644 index 00000000..c71405c4 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.js @@ -0,0 +1,228 @@ +import { + getToken +} from '../../../utils/auth' +import { + subusersList, + subusersCount +} from '../../../api/project' +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + addFlag: false, + initData: {}, + pageNum: 1, + pageSize: 10000, + total: 0, + listData: [], + activeState: "0", + yrcCount: 0, + ylcCount: 0, + activeName: "0_0", + }, + + //项目切换 返回值 + onProjectSelect(e) { + let projectId = e.detail.id; + let projectName = e.detail.text; + app.globalData.useProjectId = projectId; + app.globalData.useProjectName = projectName; + this.onLoad(); + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + if (!getToken()) { + wx.redirectTo({ + url: '../../../login/login', + }) + } + this.setData({ + addFlag: true, + initData: { + id: app.globalData.useProjectId, + text: app.globalData.useProjectName, + }, + pageNum: 1, + pageSize: 10000, + listData: [], + total: 0 + }); + //获取数据列表 + this.getListData(); + this.getListCount(); + }, + + /** + * 添加按钮 + */ + skipAdd() { + wx.redirectTo({ + url: `../add/index`, + }) + }, + + /** + * 获取详情 + * @param {*} e + */ + getInfo(e) { + let _id = e.currentTarget.dataset.set; + wx.redirectTo({ + url: `../info/index?id=${_id}`, + }) + }, + + /** + * 修改按钮 + * @param {*} e + */ + editInfo(e) { + let _id = e.currentTarget.dataset.set; + wx.redirectTo({ + url: `../add/index?id=${_id}`, + }) + }, + + // 手风琴 + onChange(e) { + this.setData({ + activeName: e.target.dataset.set + }); + }, + + /** + * 查询数据列表 + */ + getListData() { + let params = "pageNum=" + this.data.pageNum + "&pageSize=" + this.data.pageSize + "&projectId=" + app.globalData.useProjectId + "&useStatus=" + this.data.activeState + "&activeTags=finished&searchValue=magUsers"; + subusersList(params).then(res => { + if (res.code == 200) { + this.setData({ + total: res.total, + listData: this.data.listData.concat(res.rows) + }) + } + }); + }, + + /** + * 统计数据列表 + */ + getListCount() { + let params = "pageNum=" + this.data.pageNum + "&pageSize=" + this.data.pageSize + "&projectId=" + app.globalData.useProjectId + "&activeTags=finished&searchValue=subUsers"; + subusersCount(params).then(res => { + if (res.code == 200) { + let _yrc = 0, + _ylc = 0; + res.data.forEach(item => { + if (item.useStatus == "0") { + _yrc = item.total; + } else { + _ylc = item.total; + } + }); + this.setData({ + yrcCount: _yrc, + ylcCount: _ylc + }) + } + }); + }, + + /** + * 标签切换 + */ + trainJump(e) { + let index = e.currentTarget.dataset.index; + let nav = ""; + if (index == 1) { + nav = '0'; + } else { + nav = '1'; + } + this.setData({ + activeState: nav, + pageNum: 1, + pageSize: 10000, + listData: [], + }); + this.getListData(); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + returnToPage: function () { + /*关闭当前页面，跳转到其它页面。*/ + wx.redirectTo({ + url: '../../project_more/index', + }) + }, + + /** + * 滚动到底部 + */ + onScrollToLower() { + let nal = Math.ceil(this.data.total / this.data.pageSize); + if (this.data.pageNum < nal) { + this.setData({ + pageNum: this.data.pageNum + 1 + }); + this.getListData(); + } else { + console.log("已经到底了，没有数据可加载！！！"); + } + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.json b/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.json new file mode 100644 index 00000000..849b534a --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.json @@ -0,0 +1,9 @@ +{ + "usingComponents": { + "van-collapse": "@vant/weapp/collapse", + "van-collapse-item": "@vant/weapp/collapse-item", + "van-cell-group": "@vant/weapp/cell-group", + "van-cell": "@vant/weapp/cell" + }, + "navigationStyle": "custom" +} \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.wxml new file mode 100644 index 00000000..280e61d3 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.wxml @@ -0,0 +1,61 @@ + + + + + + + + + + 班组人员管理 + + + + + + + + 已入场（{{yrcCount}}） + 已离场（{{ylcCount}}） + + + + + + + + {{index < 10 ?'0'+(index+1):(index+1)}} + + {{item.subDeptName}} + + + + + + + + + + 修改 + + + + + + + + + + + + 暂无数据 + + + + + + 新增 + + + + \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.wxss b/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.wxss new file mode 100644 index 00000000..d73e4827 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.wxss @@ -0,0 +1,19 @@ +/* pages/project_subDepts/index.wxss */ +.module_see_info_edit { + color: #91ef4a; + font-weight: 600; +} + +.module_see_info_edit .edit_text { + padding-left: 10rpx; +} + +.van-cell{ + color: #89a3ee !important; + background-color: #32374c !important; +} + +.van-collapse-item__content{ + padding: 0; + background-color: transparent !important; +} \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.js b/yanzhu-ui-app/miniprogram/pages/project_qr/index.js index a293e488..9d907903 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.js @@ -401,6 +401,8 @@ Page({ userRes.data.bankName = userInfosJSON.bankName; userRes.data.bankOffice = userInfosJSON.bankOffice; userRes.data.bankCardNo = userInfosJSON.bankCardNo; + userRes.data.cardImgPos = userInfosJSON.cardImgPos; + userRes.data.cardImgInv = userInfosJSON.cardImgInv; } if (userRes.data.cardImgPos) { userRes.data.cardImgPos = (this.data.imgBase + userRes.data.cardImgPos).split(','); diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml index 69b787ef..ee8b2642 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml @@ -73,13 +73,17 @@ - 法定代表人姓名 + 法定代表人姓名 + [不可输入，证件自动识别] + - 法定代表人身份证号 + 法定代表人身份证号 + [不可输入，证件自动识别] + @@ -143,37 +147,49 @@ - 委托代理人姓名 + 委托代理人姓名 + [不可输入，证件自动识别] + - 委托代理人身份证号 + 委托代理人身份证号 + [不可输入，证件自动识别] + - 委托代理人联系电话 + 委托代理人联系电话 + [不可输入，识别登录手机号] + - 民族 + 民族 + [不可输入，证件自动识别] + - 籍贯 + 籍贯 + [不可输入，证件自动识别] + - 地址 + 地址 + [不可输入，证件自动识别] +