用户添加是否获取其他服务待办功能

业务系统流程处理分发功能优化

src/main/java/com/jeeplus/modules/centerservice/utils/RestTemplateService.java

@@ -58,7 +58,7 @@ public class RestTemplateService {
         }
         String url = getUrl(hostAddress, path, paramMap);
         HttpHeaders httpHeaders = new HttpHeaders();
-        httpHeaders.add("token","eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2ODIzOTAzMDIsInVzZXJuYW1lIjoi6Zu357qiIn0.4HBW6oSC42D1YeDIyenjI7nt94SFR_s0vyNEHu8wpWA");
+        httpHeaders.add("token","eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2ODI0ODQ1MDYsInVzZXJuYW1lIjoi6Zu357qiIn0.OAfzNwmCT4SHFEVRfwUgcSzqRUX03IaBuY8wpoEq0vw");
         httpHeaders.add("Accept", MediaType.ALL_VALUE);
 //        httpHeaders.add("cookie", "jeeplus.session.id=0635611b0f5a4401836262c7d23ae98e");
         httpHeaders.setContentType(new MediaType("application","json", Charset.forName("UTF-8")));

src/main/java/com/jeeplus/modules/centerservice/web/TranspondController.java

@@ -0,0 +1,92 @@
+package com.jeeplus.modules.centerservice.web;
+
+import com.alibaba.fastjson.JSON;
+import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workreimbursement.entity.WorkReimbursement;
+import com.jeeplus.modules.workreimbursement.web.WorkReimbursementController;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.history.HistoricProcessInstance;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.support.BindingAwareModelMap;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import org.springframework.web.servlet.mvc.support.RedirectAttributesModelMap;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * cpa系统流程审核转发controller
+ * @author: 徐滕
+ * @version: 2023-04-25 16:32
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/transpond/transpond")
+public class TranspondController extends BaseController {
+
+    @Autowired
+    protected HistoryService historyService;
+    @Autowired
+    private ActTaskService actTaskService;
+    @Autowired
+    private WorkReimbursementController workReimbursementController;
+
+    /**
+     * 报销审核操作
+     * @return
+     */
+    @RequestMapping(value = "saveAuditFunc", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> saveAuditFunc(@RequestBody Object object) {
+        Map<String,Object> map = new HashMap<>();
+        WorkReimbursement workReimbursement = JSON.parseObject(JSON.toJSONString(object), WorkReimbursement.class);
+        HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().processInstanceId(workReimbursement.getProcessInstanceId()).singleResult();
+        ProcessInstance processInstance = actTaskService.getProcIns(workReimbursement.getProcessInstanceId());
+        if (processInstance!=null) {
+            List<Task> taskList = actTaskService.getCurrentTaskList(processInstance);
+            if(taskList!=null && taskList.size()>1){
+                for (Task taskInfok:taskList) {
+                    if (UserUtils.getUser().getId().equals(taskInfok.getAssignee())) {
+                        workReimbursement.getAct().setTaskId(taskInfok.getId());
+                        workReimbursement.getAct().setTaskName(taskInfok.getName());
+                        workReimbursement.getAct().setTaskDefKey(taskInfok.getTaskDefinitionKey());
+                        workReimbursement.getAct().setProcDefId(taskInfok.getProcessDefinitionId());
+                        workReimbursement.getAct().setProcInsId(taskInfok.getProcessInstanceId());
+                        workReimbursement.getAct().setTask(taskInfok);
+                    }
+                }
+            }else {
+                Task task = actTaskService.getCurrentTaskInfo(processInstance);
+                workReimbursement.getAct().setTaskId(task.getId());
+                workReimbursement.getAct().setTaskName(task.getName());
+                workReimbursement.getAct().setTaskDefKey(task.getTaskDefinitionKey());
+                workReimbursement.getAct().setProcDefId(task.getProcessDefinitionId());
+                workReimbursement.getAct().setProcInsId(task.getProcessInstanceId());
+                workReimbursement.getAct().setTask(task);
+            }
+        }
+        RedirectAttributes redirectAttributes = new RedirectAttributesModelMap();
+        Model model = new BindingAwareModelMap();
+        workReimbursementController.saveAudit(workReimbursement, model, redirectAttributes);
+        Map<String, ?> flashAttributes = redirectAttributes.getFlashAttributes();
+        String message = (String)flashAttributes.get("message");
+        if(message.contains("成功")){
+            map.put("success", true);
+            map.put("message","操作成功");
+        }else{
+            map.put("success", false);
+            map.put("message","操作失败");
+        }
+        return map;
+    }
+}

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectMaterialDefectRecordService.java

@@ -93,6 +93,15 @@ public class ProjectMaterialDefectRecordService extends CrudService<ProjectRepor
         materialDefectRecord.setUploadMode(uploadMode);
         return materialDefectRecord;
     }
+    /**
+     * 获取归档资料说明信息
+     * @param id
+     * @return
+     */
+    public ProjectMaterialDefectRecord getMaterialDefectRecordById(String id) {
+        ProjectMaterialDefectRecord materialDefectRecord= dao.getProjectMaterialDefectRecord(id);
+        return materialDefectRecord;
+    }
 
 
     @Transactional(readOnly = false)

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportDataService.java

@@ -139,6 +139,11 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 		return projectReportData;
 	}
 
+	public ProjectReportData getById(String id) {
+		ProjectReportData projectReportData = super.get(id);
+		return projectReportData;
+	}
+
 	/**
 	 * 根据项目报告好查询报告信息
 	 * @param number

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectReportDefectRecordController.java

@@ -1120,10 +1120,10 @@ public class ProjectReportDefectRecordController extends BaseController {
 			List<ZuZhi> zhiList = JSONArray.parseArray(test,ZuZhi.class);
 			List<ProjectMaterialChoose> chooseList = new ArrayList<>();
 
-			ProjectMaterialDefectRecord defectRecord = materialDefectRecordService.getMaterialDefectRecord(materialDefectRecord.getId());
+			ProjectMaterialDefectRecord defectRecord = materialDefectRecordService.getMaterialDefectRecordById(materialDefectRecord.getId());
 			MyBeanUtils.copyBeanNotNull2Bean(materialDefectRecord, defectRecord);//将编辑表单中的非NULL值覆盖数据库记录中的值
 			//查询项目新增报告信息
-			ProjectReportData reportData = projectReportDataService.get(defectRecord.getReport().getId());
+			ProjectReportData reportData = projectReportDataService.getById(defectRecord.getReport().getId());
 			// 对不同环节的业务逻辑进行操作
 			List<User> users = null;
 			User auditUser = null;

src/main/java/com/jeeplus/modules/sys/entity/User.java

@@ -102,6 +102,7 @@ public class User extends DataEntity<User> {
 
     private String weChatId;
     private String auditUserId;  //总审人员id
+    private String otherServiceFlag;  //是否获取其他服务待办
 
 	public String getWeChatId() {
 		return weChatId;
@@ -587,6 +588,14 @@ public class User extends DataEntity<User> {
 	public void setAuditUserId(String auditUserId) {
 		this.auditUserId = auditUserId;
 	}
+
+	public String getOtherServiceFlag() {
+		return otherServiceFlag;
+	}
+
+	public void setOtherServiceFlag(String otherServiceFlag) {
+		this.otherServiceFlag = otherServiceFlag;
+	}
 	//	public String getPosition() {
 //		return position;
 //	}

src/main/java/com/jeeplus/modules/sys/web/LoginController.java

@@ -552,8 +552,15 @@ public class LoginController extends BaseController{
 				}
 			}
 		}
-		List<WorkProjectNotify> notifyList = centerCpaTaskService.getNotifyList(workProjectNotify);
-		notifyPage.getList().addAll(notifyList);
+		// 各服务引用状态 =》 （若包含，则进行获取该服务的流程信息）
+		String inquireStatus = Global.getConfig("INQUIRE_STATUS");
+		//判定如果当前登陆人是否可以查看其他服务的待办信息
+		if("1".equals(user.getOtherServiceFlag())){
+			if(inquireStatus.contains("cpa")){
+				List<WorkProjectNotify> notifyList = centerCpaTaskService.getNotifyList(workProjectNotify);
+				notifyPage.getList().addAll(notifyList);
+			}
+		}
 		Page<WorkProjectNotify> resultPage = ConvertServiceUtil.getSortAndPaging(workProjectNotifyPage, notifyPage.getList());
 		model.addAttribute("notifyPage", resultPage.getList());
 		model.addAttribute("notifyCount", notifyPage.getList().size());//未读通知条数

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -5565,7 +5565,7 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 
 
-						WorkContractInfo projectContractInfo = ruralProjectMessageService.getProjectContractInfo(ruralProjectRecords.getWorkContractInfo().getId());
+						WorkContractInfo projectContractInfo = ruralProjectMessageService.getProjectContractInfoByReported(ruralProjectRecords.getWorkContractInfo().getId());
 						ruralProjectRecords.setWorkContractInfo(projectContractInfo);
 						materialDefectRecord.getReport().setProject(new ProjectRecords());
 						MyBeanUtils.copyBeanNotNull2Bean(ruralProjectRecords,materialDefectRecord.getReport().getProject());//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -5683,42 +5683,42 @@ public class WorkProjectNotifyController extends BaseController {
 					//获取质量复核项目组成员
 					List<RuralReportConsultant> consultantinfo =this.qualityView(ruralProjectRecords,projectReportData);
 					model.addAttribute("consultantinfo", consultantinfo);
-						materialDefectRecord.setUploadMode(uploadMode);
-						model.addAttribute("projectcontentinfo", projectcontentinfo);
-						model.addAttribute("projectRecords", ruralProjectRecords);
-						model.addAttribute("projectReportData", projectReportData);
-						model.addAttribute("workContractInfo", workContractInfo);
-						model.addAttribute("materialDefectRecord", materialDefectRecord);
-						model.addAttribute("project", materialDefectRecord.getReport().getProject());
-						if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-							materialDefectRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
-							materialDefectRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
-							materialDefectRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
-							return "modules/ruralprojectrecords/record/projectRepordDescriptionView";
-						}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
-							materialDefectRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
-							materialDefectRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
-							materialDefectRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
-							if ("2".equals(ruralProjectRecords.getProjectType())){
-								model.addAttribute("identification","projectRepordDescription");
-							}
-							if ("1".equals(ruralProjectRecords.getProjectType())){
-								model.addAttribute("identification","consultProjectRepordDescription");
-							}
-//							model.addAttribute("identification","projectRepordDescription");
-							model.addAttribute("identificationName","资料缺失说明审核意见");
-							return "modules/ruralprojectrecords/record/projectRepordDescriptionAudit";
-						} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
-							materialDefectRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
-							materialDefectRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
-							materialDefectRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
-							return "modules/ruralprojectrecords/record/projectRepordDescriptionModify";
-						} else {
-							materialDefectRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
-							materialDefectRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
-							materialDefectRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
-							return "modules/ruralprojectrecords/record/projectRepordDescriptionView";
+					materialDefectRecord.setUploadMode(uploadMode);
+					model.addAttribute("projectcontentinfo", projectcontentinfo);
+					model.addAttribute("projectRecords", ruralProjectRecords);
+					model.addAttribute("projectReportData", projectReportData);
+					model.addAttribute("workContractInfo", workContractInfo);
+					model.addAttribute("materialDefectRecord", materialDefectRecord);
+					model.addAttribute("project", materialDefectRecord.getReport().getProject());
+					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+						materialDefectRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
+						materialDefectRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
+						materialDefectRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
+						return "modules/ruralprojectrecords/record/projectRepordDescriptionView";
+					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+						materialDefectRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
+						materialDefectRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
+						materialDefectRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
+						if ("2".equals(ruralProjectRecords.getProjectType())){
+							model.addAttribute("identification","projectRepordDescription");
+						}
+						if ("1".equals(ruralProjectRecords.getProjectType())){
+							model.addAttribute("identification","consultProjectRepordDescription");
 						}
+//							model.addAttribute("identification","projectRepordDescription");
+						model.addAttribute("identificationName","资料缺失说明审核意见");
+						return "modules/ruralprojectrecords/record/projectRepordDescriptionAudit";
+					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
+						materialDefectRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
+						materialDefectRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
+						materialDefectRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
+						return "modules/ruralprojectrecords/record/projectRepordDescriptionModify";
+					} else {
+						materialDefectRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
+						materialDefectRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
+						materialDefectRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
+						return "modules/ruralprojectrecords/record/projectRepordDescriptionView";
+					}
 				}else if (workProjectNotify.getType().equals("46")) {    //工作内容报告变更
 					ProjectReportData projectReportData = projectReportChangeService.get(workProjectNotify.getNotifyId());
 					Act act = getByAct(projectReportData.getProcessInstanceId());

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementNewService.java

@@ -252,9 +252,9 @@ public class WorkReimbursementNewService extends CrudService<WorkReimbursementDa
         }
 
         //判断当前登陆人的部门是否为综合管理部。如果是，则审核人设置为总审室部门主任（王年生）
-        if("6c9ca86e941b4a738c1ab9b006976264".equals(office.getId())){
+        /*if("6c9ca86e941b4a738c1ab9b006976264".equals(office.getId())){
             bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,"26f5f4aff4244d8c833cca11f305c612","8",workReimbursement.getCreateBy());
-        }
+        }*/
 
 
         //分管领导

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java

@@ -391,9 +391,9 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
             bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,"7f776d072d7b4c839cef4e63ce6dbfa5","8",workReimbursement.getCreateBy());
         }
         //判断当前登陆人的部门是否为综合管理部。如果是，则审核人设置为总审室部门主任（王年生）
-        if("6c9ca86e941b4a738c1ab9b006976264".equals(office.getId())){
+        /*if("6c9ca86e941b4a738c1ab9b006976264".equals(office.getId())){
             bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,"26f5f4aff4244d8c833cca11f305c612","8",workReimbursement.getCreateBy());
-        }
+        }*/
 
 
         //分管领导

src/main/java/com/jeeplus/modules/workstaff/entity/WorkStaffBasicInfo.java

@@ -111,6 +111,7 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 	private String handSignature;	//手签章路径
 	private String handSignatureUrl;	//手签章路径(展示)
 	private String userLoginFlag;	//用户登录状态
+	private String otherServiceFlag;	//是否获取其他服务待办
 
 	//劳动关系临时属性
 	private String relationshipStatus;
@@ -844,4 +845,12 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 	public void setUserLoginFlag(String userLoginFlag) {
 		this.userLoginFlag = userLoginFlag;
 	}
+
+	public String getOtherServiceFlag() {
+		return otherServiceFlag;
+	}
+
+	public void setOtherServiceFlag(String otherServiceFlag) {
+		this.otherServiceFlag = otherServiceFlag;
+	}
 }

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -256,6 +256,8 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         if(roleService.getRoleIdByUserId(workStaffBasicInfo.getUserId())!=null){
             //更新信息
             User user = new User();
+            user.setUpdateBy(UserUtils.getUser());
+            user.setUpdateDate(new Date());
             user.setId(workStaffBasicInfo.getUserId());
             user.setName(workStaffBasicInfo.getName());
             user.setMobile(workStaffBasicInfo.getMobile());
@@ -264,6 +266,7 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
             user.setComId(workStaffBasicInfo.getCompany().getId());
             user.setCompany(workStaffBasicInfo.getCompany());
             user.setOffice(workStaffBasicInfo.getOffice());
+            user.setOtherServiceFlag(workStaffBasicInfo.getOtherServiceFlag());
             userService.updateUser(user);
             userService.updateRole(workStaffBasicInfo);
         }else{

src/main/resources/jeeplus.properties

@@ -7,7 +7,7 @@ jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 db.name=ruihuaoa-activity-data
 #jdbc.url=jdbc:mysql://192.168.2.4:3306/simple_xg_total_process?useUnicode=true&characterEncoding=utf-8
-jdbc.url=jdbc:mysql://127.0.0.1:3306/new_ccpm?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://127.0.0.1:3306/new_ccpm_2?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
 jdbc.password=root
 #jdbc.password=root
@@ -126,8 +126,8 @@ web.maxUploadSize=30720000000
 web.staticFile=.css,.js,.png,.jpg,.gif,.jpeg,.bmp,.ico,.swf,.psd,.htc,.htm,.html,.crx,.xpi,.exe,.ipa,.apk
 
 #\u5355\u70B9\u767B\u5F55CAS\u8BBE\u7F6E
-cas.server.url=http://127.0.0.1:8180/cas 
-cas.project.url=http://127.0.0.1:8080/jeeplus
+cas.server.url=http://127.0.0.1:8180/
+cas.project.url=http://127.0.0.1:8080/
 
 #\u5DE5\u4F5C\u6D41\u8BBE\u7F6E
 activiti.isSynActivitiIndetity=false
@@ -325,7 +325,7 @@ apptoken = uIJQmTwyGJ
 appsecret = 2NMBqFigKoInmd43Wohxv5aEDKiiHo
 signature = 232a44ee9ebd251d119f0a65628f678e
 
-signature_http_top = http://192.168.2.6:9182
+signature_http_top = http://192.168.2.130:9182
 
 #竖版模板templateId
 vertical_templateId = 2894156236229259396
@@ -355,4 +355,7 @@ CPA_PATH:   http://localhost:8084
 #待办中展示其他系统的流程
 #cpa =》
 #Process_1665383385070 评估-报销审批
-CPA_TASK:   Process_1665383385070
+CPA_TASK:   Process_1665383385070
+
+#各服务引用状态 =》 （若包含，则进行获取该服务的流程信息）
+INQUIRE_STATUS: cpa

src/main/resources/mappings/modules/sys/UserDao.xml

@@ -78,6 +78,7 @@
 		a.login_date,
 		a.remarks,
 		a.login_flag,
+		a.other_service_flag,
 		a.photo,
 		a.default_photo,
 		a.qrcode,
@@ -585,6 +586,7 @@
 		update_date,
 		remarks,
 		login_flag,
+		other_service_flag,
 		photo,
 		default_photo,
 		qrcode,
@@ -613,6 +615,7 @@
 		#{updateDate},
 		#{remarks},
 		#{loginFlag},
+		#{otherServiceFlag},
 		#{photo},
 		#{defaultPhoto},
 		#{qrCode},
@@ -643,6 +646,7 @@
 		update_date = #{updateDate},
 		remarks = #{remarks},
 		login_flag = #{loginFlag},
+		other_service_flag = #{otherServiceFlag},
 		photo = #{photo},
 		default_photo = #{defaultPhoto},
 		password_remake = #{passwordRemake},
@@ -1047,6 +1051,7 @@
 		a.login_date,
 		a.remarks,
 		a.login_flag,
+		a.other_service_flag,
 		a.photo,
 		a.default_photo,
 		a.qrcode,
@@ -1066,7 +1071,7 @@
 		FROM sys_user a
 		JOIN sys_user_role ur ON ur.user_id = a.id
 		JOIN sys_role r ON ur.role_id = r.id
-		WHERE a.office_id is not null and find_in_set(r.id,#{roleIds})
+		WHERE a.office_id is not null and find_in_set(r.id,#{roleIds}) and a.login_flag = 1
 	</select>
 
 	<!-- 依据部门编号查询岗位 -->
@@ -1164,47 +1169,52 @@
 	<update id="updateUser" parameterType="User">
 		update  sys_user
 		<set>
+			update_by = #{updateBy.id}
+			,update_date = #{updateDate}
 			<if test="loginName != null and loginName != ''">
-				login_name = #{loginName},
+				,login_name = #{loginName}
 			</if>
 			<if test="passwordRemake != null and passwordRemake != ''">
-				password_remake = #{passwordRemake},
+				,password_remake = #{passwordRemake}
 			</if>
 			<if test="name != null and name != ''">
-				name = #{name},
+				,name = #{name}
 			</if>
 			<if test="sex != null and sex != ''">
-				sex = #{sex},
+				,sex = #{sex}
 			</if>
 			<if test="email != null and email != ''">
-				email = #{email},
+				,email = #{email}
 			</if>
 			<if test="phone != null and phone != ''">
-				phone = #{phone},
+				,phone = #{phone}
 			</if>
 			<if test="mobile != null and mobile != ''">
-				mobile = #{mobile},
+				,mobile = #{mobile}
 			</if>
 			<if test="remarks != null and remarks != ''">
-				remarks = #{remarks},
+				,remarks = #{remarks}
 			</if>
 			<if test="delFlag != null and delFlag != ''">
-				del_Flag = #{delFlag},
+				,del_Flag = #{delFlag}
 			</if>
 			<if test="photo != null and photo != ''">
-				photo = #{photo},
+				,photo = #{photo}
 			</if>
 			<if test="comId != null and comId != ''">
-				com_id = #{comId},
+				,com_id = #{comId}
 			</if>
 			<if test="company!=null and company.id != null and company.id != ''">
-				company_id = #{company.id},
+				,company_id = #{company.id}
 			</if>
 			<if test="office!=null  and office.id != null and office.id != ''">
-				office_id = #{office.id}
+				,office_id = #{office.id}
 			</if>
 			<if test="auditUserId!=null">
-				audit_user_id = #{auditUserId}
+				,audit_user_id = #{auditUserId}
+			</if>
+			<if test="otherServiceFlag!=null and otherServiceFlag != ''">
+				,other_service_flag = #{otherServiceFlag}
 			</if>
 		</set>
 		where id = #{id}

src/main/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml

@@ -59,7 +59,8 @@
 		a.trial_period AS "trialPeriod",
 		a.individual_resume AS "individualResume",
 		a.highest_education As "highestEducation",
-		a.hand_signature As "handSignature"
+		a.hand_signature As "handSignature",
+		a.other_service_flag As "otherServiceFlag"
 <!--		ur.role_id AS "roleId",-->
 <!--		r.name AS "roleName"-->
 	</sql>
@@ -359,7 +360,8 @@
 			trial_period,
 			individual_resume,
 			highest_education,
-			hand_signature
+			hand_signature,
+			other_service_flag
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -410,7 +412,8 @@
 			#{trialPeriod},
 			#{individualResume},
 			#{highestEducation},
-			#{handSignature}
+			#{handSignature},
+			#{otherServiceFlag}
 		)
 	</insert>
 
@@ -461,7 +464,8 @@
 			trial_period = #{trialPeriod},
 			individual_resume = #{individualResume},
 			highest_education = #{highestEducation},
-			hand_signature = #{handSignature}
+			hand_signature = #{handSignature},
+			other_service_flag = #{otherServiceFlag}
 		WHERE id = #{id}
 	</update>
 

src/main/resources/spring-context-shiro.xml

@@ -83,8 +83,11 @@
     </bean>
     <!-- 安全认证过滤器 -->
     <bean id="shiroFilter" class="org.apache.shiro.spring.web.ShiroFilterFactoryBean">
-        <property name="securityManager" ref="securityManager" /><!--
-		<property name="loginUrl" value="${cas.server.url}?service=${cas.project.url}${adminPath}/cas" /> -->
+        <property name="securityManager" ref="securityManager" />
+        <!--cas服务登陆-->
+        <!-- 设定用户的登录链接，这里为cas登录页面的链接地址可配置回调地址 -->
+		<!--<property name="loginUrl" value="${cas.server.url}?service=${cas.project.url}${adminPath}" />-->
+        <!--本应用登陆地址-->
         <property name="loginUrl" value="${adminPath}/login" />
         <property name="successUrl" value="${adminPath}?login" />
         <property name="filters">

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/projectRecordDescriptionForm.jsp

@@ -365,7 +365,7 @@
             </div>
             <input id="zuZhiList" name="zuZhiList" htmlEscape="false" readonly="true" style="display: none"/>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>说明扫描件</h2></div>
+                <div class="form-group-label"><h2><span class="require-item">*</span>说明扫描件</h2></div>
                 <div class="layui-item nav-btns">
                     <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
                         <%--<sys:collectSelect  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectRepordDescriptionAudit.jsp

@@ -385,7 +385,7 @@
 
 
 				</div>
-				<div class="form-group layui-row first" id="projectInfo">
+				<div class="form-group layui-row first hide" id="projectInfo">
 						<%--				<div class="form-group-label"><h2>项目基本信息</h2></div>--%>
 					<div class="layui-item layui-col-sm6 lw8">
 						<label class="layui-form-label">项目名称：</label>

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectRepordDescriptionModify.jsp

@@ -354,7 +354,7 @@
 			</div>
 			<input id="zuZhiList" name="zuZhiList" htmlEscape="false" readonly="true" style="display: none"/>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>说明扫描件</h2></div>
+				<div class="form-group-label"><h2><span class="require-item">*</span>说明扫描件</h2></div>
 				<div class="layui-item nav-btns">
 					<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
 						<%--<sys:collectSelect  id="linkman" url="${ctx}/workclientinfo/workClientInfo/linkmanList"

src/main/webapp/webpage/modules/workreimbursement/workReimbursementInformationTrack.jsp

@@ -94,7 +94,7 @@
 					</div>
 				</div>
 				<div class="form-group layui-row">
-					<div class="form-group-label"><h2>说明扫描件</h2></div>
+					<div class="form-group-label"><h2><span class="require-item">*</span>说明扫描件</h2></div>
 					<div id="addFile_attachment" style="display: none" class="upload-progress">
 						<span id="fileName_attachment" ></span>
 						<b><span id="baifenbi_attachment" ></span></b>

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -653,6 +653,16 @@
                         <form:input placeholder="请输入最高学历" path="highestEducation" htmlEscape="false" class="form-control layui-input required" maxlength="64"/>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>是否获取其他服务待办：</label>
+                    <div class="layui-input-block">
+                        <form:select path="otherServiceFlag" class="form-control simple-select required">
+                            <form:option value="" label="请选择"/>
+                            <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+
                 <div class="layui-item layui-col-sm12  lw7 with-textarea">
                     <label class="layui-form-label">备注：</label>
                     <div class="layui-input-block">