From d45a66a2fec6ea615c1159f93e2ee7783b6dec65 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: Wed, 5 Feb 2025 21:34:18 +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 --- yanzhu-common/yanzhu-common-core/pom.xml | 5 +++ .../yanzhu/common/core/utils}/OcrService.java | 39 ++++++++--------- .../mapper/flowable/FlowBusinessKeyMapper.xml | 4 +- .../ProProjectInfoSubdeptsUsersMapper.xml | 2 +- .../controller/FlowBusinessKeyController.java | 27 ++++-------- .../listener/FlowGroSignListener.java | 41 ++++++++++++++++++ .../listener/FlowProSignListener.java | 42 +++++++++++++++++++ .../service/impl/FlowTaskServiceImpl.java | 1 - ...ProProjectInfoSubdeptsUsersController.java | 24 +++++------ .../IProProjectInfoSubdeptsUsersService.java | 12 ++++++ ...roProjectInfoSubdeptsUsersServiceImpl.java | 27 +++++++++++- .../src/main/resources/bootstrap.yml | 2 +- yanzhu-modules/yanzhu-system/pom.xml | 5 +-- .../system/controller/ToolsController.java | 11 ++--- .../miniprogram/pages/login/login.wxml | 2 +- .../project_flowable/approveTask/index.js | 6 +-- .../project_flowable/approveTask/index.wxml | 26 ++++++------ .../project_flowable/detailTask/index.js | 6 +-- .../project_flowable/detailTask/index.wxml | 26 ++++++------ .../miniprogram/pages/project_info/index.js | 14 ++++++- .../miniprogram/pages/project_info/index.wxml | 2 +- .../miniprogram/pages/project_qr/index.js | 20 +++++---- .../miniprogram/pages/project_qr/index.wxml | 4 +- .../miniprogram/project.private.config.json | 2 +- 24 files changed, 232 insertions(+), 118 deletions(-) rename {yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl => yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils}/OcrService.java (77%) create mode 100644 yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowGroSignListener.java create mode 100644 yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowProSignListener.java diff --git a/yanzhu-common/yanzhu-common-core/pom.xml b/yanzhu-common/yanzhu-common-core/pom.xml index 474002f4..ee2b6685 100644 --- a/yanzhu-common/yanzhu-common-core/pom.xml +++ b/yanzhu-common/yanzhu-common-core/pom.xml @@ -143,5 +143,10 @@ ${hutool.version} + + com.squareup.okhttp3 + okhttp + + diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/OcrService.java b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/OcrService.java similarity index 77% rename from yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/OcrService.java rename to yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/OcrService.java index d6741870..4fc3a16d 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/OcrService.java +++ b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/OcrService.java @@ -1,30 +1,22 @@ -package com.yanzhu.system.service.impl; +package com.yanzhu.common.core.utils; -import com.alibaba.fastjson.JSONObject; -import com.yanzhu.common.core.web.domain.AjaxResult; -import com.yanzhu.common.redis.service.RedisService; -import com.yanzhu.system.controller.ToolsController; +import com.alibaba.fastjson2.JSONObject; import okhttp3.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import java.io.IOException; import java.util.HashMap; import java.util.Map; -@Service public class OcrService { - @Autowired - private RedisService redisService; - final String TOKEN_URL="https://aip.baidubce.com/oauth/2.0/token"; - final String OCR_URL="https://aip.baidubce.com/rest/2.0/ocr/v1/idcard"; - final String APP_ID = "6283230"; - final String APP_KEY="rS40xCCuGuVNFRopPI0jlMuj"; - final String APP_SECRET="3bY7dADqQq3O4UpXpFA1FJAj6LN57QCS"; + public static final String TOKEN_URL="https://aip.baidubce.com/oauth/2.0/token"; + public static final String OCR_URL="https://aip.baidubce.com/rest/2.0/ocr/v1/idcard"; + public static final String APP_ID = "6283230"; + public static final String APP_KEY="rS40xCCuGuVNFRopPI0jlMuj"; + public static final String APP_SECRET="3bY7dADqQq3O4UpXpFA1FJAj6LN57QCS"; - public String getToken() { + public static String getToken() { RequestBody body = new FormBody.Builder() .add("grant_type", "client_credentials") .add("client_id", APP_KEY) @@ -37,7 +29,7 @@ public class OcrService { JSONObject jo=JSONObject.parseObject(result); return jo.getString("access_token"); } - public String getResult(Request request) { + public static String getResult(Request request) { OkHttpClient client = new OkHttpClient(); Response response; try { @@ -54,7 +46,7 @@ public class OcrService { } - private String getJson(JSONObject data, String key) { + private static String getJson(JSONObject data, String key) { if(data!=null){ JSONObject jo=data.getJSONObject(key); if(jo!=null){ @@ -65,7 +57,7 @@ public class OcrService { return ""; } - public Map getFront(String url){ + public static Map getFront(String url){ String token = getToken(); RequestBody body = new FormBody.Builder() .add("url", url) @@ -93,7 +85,7 @@ public class OcrService { return map; } - public Map getBack(String url){ + public static Map getBack(String url){ String token = getToken(); RequestBody body = new FormBody.Builder() .add("url", url) @@ -114,18 +106,21 @@ public class OcrService { map.put("issuing",issuing); return map; } + public static void main(String[] args) { //getFront(); getBack(); } + private static void getBack() { String url="https://gss0.baidu.com/9fo3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/a8014c086e061d95103a068779f40ad162d9ca14.jpg"; - Map o= new OcrService().getBack(url); + Map o= OcrService.getBack(url); System.out.printf(o.toString()); } + private static void getFront() { String url="http://62.234.3.186/statics/2025/01/19/4491f170cd1609142f9a6f097cbf681f_20250119000046A004.jpg"; - Map o= new OcrService().getFront(url); + Map o= OcrService.getFront(url); System.out.printf(o.toString()); } } 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 ede931b0..bbfa7138 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,11 @@ diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml index 45f85569..0f79f9a7 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml @@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select psu.id, psu.par_id, psu.com_id, psu.project_id, pi.project_name, psu.sub_dept_id, psu.sub_dept_type, dic3.dict_label as sub_dept_type_name, psu.sub_dept_name, psu.sub_dept_power_path, psu.user_id, psu.user_post, psu.sub_dept_group, - psu.sub_dept_group_name, psu.user_name, psu.card_type, psu.card_code, psu.user_sex, psu.user_picture, psu.user_phone, psu.degree_grade, dic4.dict_label as degree_grade_name, psu.user_infos, psu.craft_type, psu.craft_post, psu.edu_status, psu.edu_file_path, psu.edu_date, psu.approve_status, + psu.sub_dept_group_name, psu.user_name, psu.card_type, psu.card_code, psu.user_sex, psu.user_picture, psu.user_phone, psu.degree_grade, dic4.dict_label as degree_grade_name, psu.user_infos, psu.craft_type, dic1.dict_label as craft_type_name, psu.craft_post, dic2.dict_label as craft_post_name, psu.edu_status, psu.edu_file_path, psu.edu_date, psu.approve_status, psu.use_date, psu.use_status, psu.admit_guid, psu.qr_code, psu.sub_step, psu.illness_status, psu.sup_illness_status, psu.is_del, psu.create_by, psu.create_time, psu.update_by, psu.update_time, psu.remark,psu.face_guid from pro_project_info_subdepts_users psu 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 0d903daa..764a968d 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 @@ -109,26 +109,15 @@ public class FlowBusinessKeyController extends BaseController { */ @GetMapping(value = "/queryCount") public AjaxResult queryCount(FlowTaskEntity flowTaskEntity) { - LoginUser loginUser = SecurityUtils.getLoginUser(); - if(SecurityUtils.isAdmin(loginUser.getUserid())){ - // TODO：超管查询所有申请... - if(Objects.nonNull(loginUser.getProjectDeptId())){ - flowTaskEntity.setStartComId(Convert.toStr(loginUser.getProjectDeptId())); - } - if(Objects.nonNull(loginUser.getProjectId())){ - flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId())); - } - }else if(SecurityUtils.isGSAdmin()){ - // 公司管理员查询公司内的所有申请... - flowTaskEntity.setStartComId(Convert.toStr(loginUser.getProjectDeptId())); - if(Objects.nonNull(loginUser.getProjectId())){ - flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId())); - } - }else if(SecurityUtils.isXMAdmin()){ - // 公司管理员查询公司内的所有申请... - flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId())); + flowTaskEntity.setAssigneeId(SecurityUtils.getUserId()); + List roles = SecurityUtils.getLoginUser().getSysUser().getRoles(); + if(StringUtils.isNotEmpty(roles)){ + List roleIds = roles.stream().map(SysRole::getRoleId).collect(Collectors.toList()); + flowTaskEntity.setRoleIds(roleIds); }else{ - flowTaskEntity.setStartUserId(Convert.toStr(loginUser.getUserid())); + List roleIds = new ArrayList<>(); + roleIds.add(0L); + flowTaskEntity.setRoleIds(roleIds); } return success(flowBusinessKeyService.quueryCount(flowTaskEntity)); } diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowGroSignListener.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowGroSignListener.java new file mode 100644 index 00000000..41a0e47b --- /dev/null +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowGroSignListener.java @@ -0,0 +1,41 @@ +package com.yanzhu.flowable.listener; + +import com.yanzhu.common.core.constant.SecurityConstants; +import com.yanzhu.common.core.text.Convert; +import com.yanzhu.system.api.RemoteProService; +import lombok.extern.slf4j.Slf4j; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.ExecutionListener; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; + +/** + * 班组审批签名执行监听器 + * + * 执行监听器允许在执行过程中执行Java代码。 + * 执行监听器可以捕获事件的类型： + * 流程实例启动，结束 + * 输出流捕获 + * 获取启动，结束 + * 路由开始，结束 + * 中间事件开始，结束 + * 触发开始事件，触发结束事件 + * + * @author JiangYuQi + * @date 2024/12/16 + */ +@Slf4j +@Component +public class FlowGroSignListener implements ExecutionListener { + + @Lazy + @Autowired + private RemoteProService remoteProService; + + @Override + public void notify(DelegateExecution execution) { + log.info("班组审批签名执行监听器:{}", execution.getProcessInstanceBusinessKey()); + remoteProService.subDeptsUserGroSign(Convert.toLong(execution.getProcessInstanceBusinessKey(),null), SecurityConstants.INNER); + } +} diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowProSignListener.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowProSignListener.java new file mode 100644 index 00000000..7b463ed7 --- /dev/null +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/listener/FlowProSignListener.java @@ -0,0 +1,42 @@ +package com.yanzhu.flowable.listener; + +import com.yanzhu.common.core.constant.SecurityConstants; +import com.yanzhu.common.core.text.Convert; +import com.yanzhu.system.api.RemoteProService; +import lombok.extern.slf4j.Slf4j; +import org.flowable.common.engine.api.delegate.Expression; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.ExecutionListener; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; + +/** + * 项目审批签名执行监听器 + * + * 执行监听器允许在执行过程中执行Java代码。 + * 执行监听器可以捕获事件的类型： + * 流程实例启动，结束 + * 输出流捕获 + * 获取启动，结束 + * 路由开始，结束 + * 中间事件开始，结束 + * 触发开始事件，触发结束事件 + * + * @author JiangYuQi + * @date 2024/12/16 + */ +@Slf4j +@Component +public class FlowProSignListener implements ExecutionListener { + + @Lazy + @Autowired + private RemoteProService remoteProService; + + @Override + public void notify(DelegateExecution execution) { + log.info("项目审批签名执行监听器:{}", execution.getProcessInstanceBusinessKey()); + remoteProService.subDeptsUserProSign(Convert.toLong(execution.getProcessInstanceBusinessKey(),null), SecurityConstants.INNER); + } +} diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowTaskServiceImpl.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowTaskServiceImpl.java index cd61b395..87764930 100644 --- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowTaskServiceImpl.java +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/service/impl/FlowTaskServiceImpl.java @@ -115,7 +115,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask }else{ taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.NORMAL.getType(), taskVo.getAssignee()+"重新提交流程申请！！"); } - taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.NORMAL.getType(), taskVo.getComment()); taskService.setAssignee(taskVo.getTaskId(), userId); taskService.complete(taskVo.getTaskId(), taskVo.getVariables()); } 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 dda42786..5ae7d451 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 @@ -159,17 +159,6 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController return R.ok(AjaxResult.success()); } - /** - * 项目安全承诺书文件签名章 - */ - @InnerAuth - @GetMapping("/subDeptsUserProSign/{busKey}") - public R subDeptsUserProSign(@PathVariable("busKey") Long busKey) - { - proProjectInfoSubdeptsUsersService.approveSubDeptsUser(busKey); - return R.ok(AjaxResult.success()); - } - /** * 班组安全承诺书文件签名章 */ @@ -177,7 +166,18 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController @GetMapping("/subDeptsUserGroSign/{busKey}") public R subDeptsUserGroSign(@PathVariable("busKey") Long busKey) { - proProjectInfoSubdeptsUsersService.approveSubDeptsUser(busKey); + proProjectInfoSubdeptsUsersService.approveSubDeptsUserGroSign(busKey); + return R.ok(AjaxResult.success()); + } + + /** + * 项目安全承诺书文件签名章 + */ + @InnerAuth + @GetMapping("/subDeptsUserProSign/{busKey}") + public R subDeptsUserProSign(@PathVariable("busKey") Long busKey) + { + proProjectInfoSubdeptsUsersService.approveSubDeptsUserProSign(busKey); return R.ok(AjaxResult.success()); } 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 c0b7e32b..641b9fd8 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 @@ -112,6 +112,18 @@ public interface IProProjectInfoSubdeptsUsersService */ public void approveSubDeptsUser(Long id); + /** + * 班组安全承诺书文件签名章 + * @param id + */ + public void approveSubDeptsUserGroSign(Long id); + + /** + * 项目安全承诺书文件签名章 + * @param id + */ + public void approveSubDeptsUserProSign(Long id); + /** * 新增建设单位人员 * 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 a616d80d..1e93e26b 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 @@ -393,7 +393,8 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu // 劳务人员绑定班组信息 proProjectInfoSubdeptsUsers.setSubDeptGroup(parUsers.getSubDeptGroup()); proProjectInfoSubdeptsUsers.setSubDeptGroupName(parUsers.getSubDeptGroupName()); - + proProjectInfoSubdeptsUsers.setCraftType(parUsers.getCraftType()); + proProjectInfoSubdeptsUsers.setCraftPost(parUsers.getCraftPost()); sysUser.setUserType(UserTypeEnums.FBLWRY.getCode()); } } @@ -835,13 +836,35 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu log.error(e.getMessage()); } } + + // 审核文件签名（） + + proProjectInfoSubdeptsUsers.setUseStatus(UseStateEnums.IN.getCode()); proProjectInfoSubdeptsUsers.setApproveStatus(ApproveStatus.exempt.getCode()); proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); - //增加入场 + // 人员入场信息 uniService.syncUniUser(proProjectInfoSubdeptsUsers); } + /** + * 班组安全承诺书文件签名章 + * @param id + */ + @Override + public void approveSubDeptsUserGroSign(Long id){ + ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(id); + } + + /** + * 项目安全承诺书文件签名章 + * @param id + */ + @Override + public void approveSubDeptsUserProSign(Long id){ + ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(id); + } + /** * 封装用户文件参数... * @param proSubdeptsUser 用户对象 diff --git a/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml index 629215d5..c38ffba5 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml +++ b/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml @@ -16,7 +16,7 @@ spring: # 服务注册地址 server-addr: @discovery.server-addr@ # 服务分组 - group: lijun + group: JiangYuQi config: # 配置中心地址 server-addr: @discovery.server-addr@ diff --git a/yanzhu-modules/yanzhu-system/pom.xml b/yanzhu-modules/yanzhu-system/pom.xml index d696ba6a..ad21b65d 100644 --- a/yanzhu-modules/yanzhu-system/pom.xml +++ b/yanzhu-modules/yanzhu-system/pom.xml @@ -90,10 +90,7 @@ 3.6.2 compile - - com.squareup.okhttp3 - okhttp - + diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/ToolsController.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/ToolsController.java index 0c628d1b..0ae70d08 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/ToolsController.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/ToolsController.java @@ -2,10 +2,8 @@ package com.yanzhu.system.controller; import com.yanzhu.common.core.web.controller.BaseController; import com.yanzhu.common.core.web.domain.AjaxResult; -import com.yanzhu.system.service.impl.OcrService; -import org.springframework.beans.factory.annotation.Autowired; +import com.yanzhu.common.core.utils.OcrService; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -13,16 +11,13 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/tools") public class ToolsController extends BaseController { - @Autowired - private OcrService ocrService; - @GetMapping("/id/front") public AjaxResult getFront(String url) { - return AjaxResult.success(ocrService.getFront(url)); + return AjaxResult.success(OcrService.getFront(url)); } @GetMapping("/id/back") public AjaxResult getBack(String url) { - return AjaxResult.success(ocrService.getBack(url)); + return AjaxResult.success(OcrService.getBack(url)); } } diff --git a/yanzhu-ui-app/miniprogram/pages/login/login.wxml b/yanzhu-ui-app/miniprogram/pages/login/login.wxml index 1653f44c..5bb7b31f 100644 --- a/yanzhu-ui-app/miniprogram/pages/login/login.wxml +++ b/yanzhu-ui-app/miniprogram/pages/login/login.wxml @@ -34,6 +34,6 @@ - + \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.js b/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.js index a76b9b02..a6798827 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.js @@ -110,8 +110,8 @@ Page({ let files = res.data.eduFilePath.split('/'); res.data.eduFileName = files[files.length - 1]; } - if(res.data.user.userInfos){ - res.data.user.userInfos = JSON.parse(res.data.user.userInfos); + if(res.data.userInfos){ + res.data.userInfos = JSON.parse(res.data.userInfos); } this.setData({ subDeptUserData: res.data @@ -343,7 +343,7 @@ Page({ let paths = e.target.dataset.set; let path = []; paths.split(',').forEach(url => { - path.push(config.baseUrl + url); + path.push(config.baseImgUrl + url); }); wx.previewImage({ urls: path, 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 5c1f909d..d4d215b1 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml @@ -162,7 +162,7 @@ 委托代理人 人员姓名 - {{subDeptUserData.user.nickName}} + {{subDeptUserData.userName}} @@ -171,7 +171,7 @@ 代理人身份证 身份证号码 - {{subDeptUserData.user.cardCode}} + {{subDeptUserData.cardCode}} @@ -193,13 +193,13 @@ 所属民族 - {{subDeptUserData.user.userInfos.nativePlace}} + {{subDeptUserData.userInfos.nativePlace}} 详细地址 - {{subDeptUserData.user.userInfos.address}} + {{subDeptUserData.userInfos.address}} @@ -211,8 +211,8 @@ - - + + @@ -224,7 +224,7 @@ - + @@ -245,37 +245,37 @@ 联系电话 - {{subDeptUserData.user.phonenumber}} + {{subDeptUserData.userPhone}} 紧急联系人 - {{subDeptUserData.user.userInfos.emergencyContact}} + {{subDeptUserData.userInfos.emergencyContact}} 紧急联系电话 - {{subDeptUserData.user.userInfos.contactPhone}} + {{subDeptUserData.userInfos.contactPhone}} 开户行名称 - {{subDeptUserData.user.userInfos.bankName}} + {{subDeptUserData.userInfos.bankName}} 开户行网点 - {{subDeptUserData.user.userInfos.bankOffice}} + {{subDeptUserData.userInfos.bankOffice}} 工资银行卡号 - {{subDeptUserData.user.userInfos.bankCardNo}} + {{subDeptUserData.userInfos.bankCardNo}} 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 7f7ae332..90b002da 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.js @@ -109,8 +109,8 @@ Page({ let files = res.data.eduFilePath.split('/'); res.data.eduFileName = files[files.length - 1]; } - if(res.data.user.userInfos){ - res.data.user.userInfos = JSON.parse(res.data.user.userInfos); + if(res.data.userInfos){ + res.data.userInfos = JSON.parse(res.data.userInfos); } this.setData({ subDeptUserData: res.data @@ -325,7 +325,7 @@ Page({ let paths = e.target.dataset.set; let path = []; paths.split(',').forEach(url => { - path.push(config.baseUrl + url); + path.push(config.baseImgUrl + url); }); wx.previewImage({ urls: path, 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 8e60ecd2..11973afc 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml @@ -162,7 +162,7 @@ 委托代理人 人员姓名 - {{subDeptUserData.user.nickName}} + {{subDeptUserData.userName}} @@ -171,7 +171,7 @@ 代理人身份证 身份证号码 - {{subDeptUserData.user.cardCode}} + {{subDeptUserData.cardCode}} @@ -193,13 +193,13 @@ 所属民族 - {{subDeptUserData.user.userInfos.nativePlace}} + {{subDeptUserData.userInfos.nativePlace}} 详细地址 - {{subDeptUserData.user.userInfos.address}} + {{subDeptUserData.userInfos.address}} @@ -211,8 +211,8 @@ - - + + @@ -224,7 +224,7 @@ - + @@ -245,37 +245,37 @@ 联系电话 - {{subDeptUserData.user.phonenumber}} + {{subDeptUserData.userPhone}} 紧急联系人 - {{subDeptUserData.user.userInfos.emergencyContact}} + {{subDeptUserData.userInfos.emergencyContact}} 紧急联系电话 - {{subDeptUserData.user.userInfos.contactPhone}} + {{subDeptUserData.userInfos.contactPhone}} 开户行名称 - {{subDeptUserData.user.userInfos.bankName}} + {{subDeptUserData.userInfos.bankName}} 开户行网点 - {{subDeptUserData.user.userInfos.bankOffice}} + {{subDeptUserData.userInfos.bankOffice}} 工资银行卡号 - {{subDeptUserData.user.userInfos.bankCardNo}} + {{subDeptUserData.userInfos.bankCardNo}} diff --git a/yanzhu-ui-app/miniprogram/pages/project_info/index.js b/yanzhu-ui-app/miniprogram/pages/project_info/index.js index d80a180b..f19e7f75 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_info/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_info/index.js @@ -360,8 +360,8 @@ Page({ //统计劳务人员信息 this.getSubDeptsUsers(app.globalData.useProjectId); this.initSubDeptDaysCharts(app.globalData.useProjectId); - this.awaitTask(); } + this.awaitTask(); //今日出勤信息 if (app.globalData.subDeptUserData.subDeptType=='1') { this.getSubDeptsAttendanceView(app.globalData.useProjectId); @@ -523,6 +523,18 @@ Page({ }) }, + showImg:function(e){ + let paths = e.target.dataset.set; + let path = []; + paths.split(',').forEach(url => { + path.push(config.baseImgUrl + url); + }); + wx.previewImage({ + urls: path, + current: path[0] + }) + }, + /** * 劳务管理查看详细 */ diff --git a/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml index db0bd34a..d99cd4f7 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml @@ -151,7 +151,7 @@ - + 项目经理 扫描二维码登记信息，完成安全学习和在线考试，签署安全承诺书后可申请入场。 diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.js b/yanzhu-ui-app/miniprogram/pages/project_qr/index.js index e8094ced..de017a2d 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.js @@ -141,7 +141,7 @@ Page({ this.setData({ "form.parId": options.PARID, }); - this.getProSubDeptsUser(); + this.getProSubDeptsUser(options.PARID); } let title = ""; let _userPostList = []; @@ -174,7 +174,7 @@ Page({ title = "参建单位管理人员信息登记"; } else if (options.SIGID == '4') { title = "参建单位劳务人员信息登记"; - _userPost.push({ + _userPostList.push({ "id": "4", "text": "劳务人员" }); @@ -263,8 +263,8 @@ Page({ /** * 查询单位上级人员信息 */ - getProSubDeptsUser() { - findProSubDeptsUserById(this.data.form.parId).then(res => { + getProSubDeptsUser(parId) { + findProSubDeptsUserById(parId).then(res => { if (res.code == 200) { this.setData({ parForm: res.data @@ -1512,11 +1512,13 @@ Page({ app.toast("请上传进场半身近照！"); return false; } - - if (!form.subDeptPowerPath || form.subDeptPowerPath.length == 0) { - app.toast("请上传委托人单位委托书！"); - return false; + if(userPost == '2' || userPost == '6'){ + if (!form.subDeptPowerPath || form.subDeptPowerPath.length == 0) { + app.toast("请上传委托人单位委托书！"); + return false; + } } + if (!form.userName) { app.toast("请填写姓名！"); return false; @@ -1654,6 +1656,8 @@ Page({ userInfos.bankName = _form.bankName; userInfos.bankOffice = _form.bankOffice; userInfos.bankCardNo = _form.bankCardNo; + userInfos.cardImgPos = _form.cardImgPos; + userInfos.cardImgInv = _form.cardImgInv; _form.userInfos = JSON.stringify(userInfos); wx.showLoading({mask: true,title: '正在处理'}); registerSubDeptsUsers(_form).then(res => { diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml index 758c0e71..2ecaf78f 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml @@ -12,7 +12,7 @@ 同意数字工程系统《用户隐私协议》 --> - + @@ -357,7 +357,7 @@ - + 劳务单位委托书 [需加盖劳务单位的公章委托书照片] diff --git a/yanzhu-ui-app/miniprogram/project.private.config.json b/yanzhu-ui-app/miniprogram/project.private.config.json index 1abc6579..eec34099 100644 --- a/yanzhu-ui-app/miniprogram/project.private.config.json +++ b/yanzhu-ui-app/miniprogram/project.private.config.json @@ -11,7 +11,7 @@ { "name": "pages/project_qr/index", "pathName": "pages/project_qr/index", - "query": "QRPID=132&SIGID=3&PARID=35", + "query": "QRPID=132&SIGID=4&PARID=40", "launchMode": "default", "scene": null },