流程处理

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActBusinessController.java

@@ -569,6 +569,9 @@ public class ActBusinessController {
 
         Map<String,Object> map=new HashMap<>();
         map.put("userId",loginUser.getUsername());//当前登陆人
+        if(loginUser.getUsername().equals("admin")){
+            map.put("userId",null);//当前登陆人
+        }
         if(param.getTableName().equals("incident_ticket")){
             map.put("userId",null);//当前登陆人
         }
@@ -597,7 +600,16 @@ public class ActBusinessController {
         //拼接业务字段属性sql
         if(tableColumnList!=null&&tableColumnList.size()>0){
             for(Map<String,Object> column:tableColumnList){
-                columnIncrease=columnIncrease+"cl."+column.get("columnName").toString()+" as "+param.getTableName()+"__"+column.get("columnName").toString()+",";
+                StringBuffer sb = new StringBuffer(" case when ");
+                sb.append("cl."+column.get("columnName").toString()).append(" LIKE '[]' then '' ");
+                sb.append("when cl."+column.get("columnName").toString()).append(" like 'T0%' ");
+                sb.append("then (select realname from sys_user where username = ");
+                sb.append("cl.").append(column.get("columnName").toString()).append(" ) ");
+                sb.append(" else ").append("cl."+column.get("columnName").toString());
+                sb.append(" end ");
+
+//                columnIncrease=columnIncrease+"cl."+column.get("columnName").toString()+" as "+param.getTableName()+"__"+column.get("columnName").toString()+",";
+                columnIncrease=columnIncrease+sb.toString()+" as "+param.getTableName()+"__"+column.get("columnName").toString()+",";
             }
         }
         //截掉最后一个符号

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/IncidentTicketController.java

@@ -97,13 +97,40 @@ public class IncidentTicketController {
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
+		String processor = incidentTicket.getProcessor();
+		String handle = incidentTicket.getHandle();
+		incidentTicket.setProcessor(null);
+		incidentTicket.setHandle(null);
 		QueryWrapper<IncidentTicket> queryWrapper = QueryGenerator.initQueryWrapper(incidentTicket, req.getParameterMap());
 		queryWrapper.eq("1","1");
 //		queryWrapper.last("and id in(select table_id from act_z_business where table_name='incident_ticket' and result = 2) " +
 //				"order by accident_number desc ");
 
-		queryWrapper.last("and id in(select table_id from act_z_business where table_name='incident_ticket' and result = 2) " +
-				"order by date_format(create_time,'%Y-%m-%d') desc ,substring_index(accident_number, '-', -1) + 0 desc ");
+		if(StringUtils.isNotBlank(processor)){
+			if(StringUtils.isBlank(handle)){
+
+				queryWrapper.last("and id in (select pk_incident_ticket from incident_ticket_msg where user_id = '"+processor+"' ) " +
+						"and id in(select table_id from act_z_business where table_name='incident_ticket' and result = 2) " +
+						"order by date_format(create_time,'%Y-%m-%d') desc ,substring_index(accident_number, '-', -1) + 0 desc ");
+
+			}else{
+				if(handle.equals("是")){
+
+					queryWrapper.last("and id in (select pk_incident_ticket from incident_ticket_msg where user_id = '"+processor+"' and confirm != '否') " +
+							"and id in(select table_id from act_z_business where table_name='incident_ticket' and result = 2) " +
+							"order by date_format(create_time,'%Y-%m-%d') desc ,substring_index(accident_number, '-', -1) + 0 desc ");
+
+				}else{
+					queryWrapper.last("and id in (select pk_incident_ticket from incident_ticket_msg where user_id = '"+processor+"' and confirm = '否') " +
+							"and id in(select table_id from act_z_business where table_name='incident_ticket' and result = 2) " +
+							"order by date_format(create_time,'%Y-%m-%d') desc ,substring_index(accident_number, '-', -1) + 0 desc ");
+				}
+			}
+
+		}else{
+			queryWrapper.last("and id in(select table_id from act_z_business where table_name='incident_ticket' and result = 2) " +
+					"order by date_format(create_time,'%Y-%m-%d') desc ,substring_index(accident_number, '-', -1) + 0 desc ");
+		}
 
 		Page<IncidentTicket> page = new Page<IncidentTicket>(pageNo, pageSize);
 		IPage<IncidentTicket> pageList = incidentTicketService.page(page, queryWrapper);

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/SyCarryController.java

@@ -14,6 +14,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.LoginUser;
 import org.apache.shiro.SecurityUtils;
@@ -87,6 +88,7 @@ public class SyCarryController {
 	 * @param syCarryPage
 	 * @return
 	 */
+	@AutoLog(value = "搬运工对账单-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody SyCarryPage syCarryPage) {
 		SyCarry syCarry = new SyCarry();
@@ -101,6 +103,7 @@ public class SyCarryController {
 	 * @param syCarryPage
 	 * @return
 	 */
+	@AutoLog(value = "搬运工对账单-编辑")
 	@PutMapping(value = "/edit")
 	public Result<?> edit(@RequestBody SyCarryPage syCarryPage) {
 		SyCarry syCarry = new SyCarry();
@@ -115,6 +118,7 @@ public class SyCarryController {
 	 * @param id
 	 * @return
 	 */
+	@AutoLog(value = "搬运工对账单-删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 	    syCarryService.delMain(id);
@@ -127,6 +131,7 @@ public class SyCarryController {
 	 * @param ids
 	 * @return
 	 */
+	@AutoLog(value = "搬运工对账单-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		String[] idL = ids.split(",");
@@ -340,6 +345,7 @@ public class SyCarryController {
 	  * @param ids
 	  * @return
 	  */
+	 @AutoLog(value = "搬运工对账单-批量审批")
 	 @GetMapping(value = "/commitBatch")
 	 public Result<?> commitBatch(@RequestParam(name="ids",required=true) String ids,@RequestParam(name="state",required=true) String state) {
 		 String res = this.syCarryService.commitBatch(Arrays.asList(ids.split(",")),state);
@@ -358,6 +364,7 @@ public class SyCarryController {
 	  * @param id
 	  * @return
 	  */
+	 @AutoLog(value = "搬运工对账单-计划员签名")
 	 @GetMapping(value = "/signPlan")
 	 public Result<?> signPlan(@RequestParam(name="id",required=true) String id) {
 		 String res = syCarryService.signPlan(id);
@@ -369,4 +376,41 @@ public class SyCarryController {
 
 	 }
 
+	 /**
+	  * 计划员取消签名
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "搬运工对账单-计划员取消签名")
+	 @GetMapping(value = "/signPlanReturn")
+	 public Result<?> signPlanReturn(@RequestParam(name="id",required=true) String id,
+									 @RequestParam(name="headId",required=true) String headId) {
+		 String res = syCarryService.signPlanReturn(id,headId);
+		 if(res.equals("取消成功")){
+			 return Result.ok(res);
+		 }else{
+			 return Result.error(res);
+		 }
+
+	 }
+
+ 	/**
+	  * 初始化
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "搬运工对账单-一键回退")
+	 @GetMapping(value = "/initial")
+	 public Result<?> initial(@RequestParam(name="id",required=true) String id) {
+		 String res = syCarryService.initial(id);
+		 if(res.equals("操作成功")){
+			 return Result.ok(res);
+		 }else{
+			 return Result.error(res);
+		 }
+
+	 }
+
  }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/IncidentTicket.java

@@ -228,4 +228,10 @@ public class IncidentTicket implements Serializable {
 
 	@TableField(exist = false)
 	private String u8Invoices;//运费发票号（子表中数据，以逗号分割显示）
+
+	@TableField(exist = false)
+	private String processor;//处理人
+
+	@TableField(exist = false)
+	private String handle;//是否处理（是否）
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/xml/CdScheduleMapper.xml

@@ -33,18 +33,32 @@
     </select>
 
     <select id="getListByUser" resultType="org.jeecg.modules.oa.entity.CdSchedule">
+
         SELECT
+            *
+        FROM
+            cd_schedule
+        WHERE del_flag = 0 and info_num > 0
+          and date_format(now(), '%Y%m%d') BETWEEN start_time and end_time
+          and date_format(IFNULL(plan_time,now()), '%H') = date_format(now(), '%H')
+
+        <!--SELECT
            *
         FROM
             cd_schedule
         WHERE del_flag = 0 and info_num > 0
-        and create_by = #{userName} and date_format(now(), '%Y%m%d') BETWEEN start_time and end_time
+        and create_by = #{userName} and date_format(now(), '%Y%m%d') BETWEEN start_time and end_time -->
     </select>
 
     <update id="updateInfoNum">
         update cd_schedule set info_num = 0
         WHERE del_flag = 0 and info_num > 0
-        and create_by = #{userName} and date_format(now(), '%Y%m%d') BETWEEN start_time and end_time
-    </update>
+        and date_format(now(), '%Y%m%d') BETWEEN start_time and end_time
+        and date_format(IFNULL(plan_time,now()), '%H') = date_format(now(), '%H')
+
+        <!--  update cd_schedule set info_num = 0
+          WHERE del_flag = 0 and info_num > 0
+          and create_by = #{userName} and date_format(now(), '%Y%m%d') BETWEEN start_time and end_time-->
+      </update>
 
-</mapper>
+  </mapper>

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/ISyCarryService.java

@@ -47,4 +47,14 @@ public interface ISyCarryService extends IService<SyCarry> {
 	 * 计划员签名
 	 */
 	public String signPlan(String id);
+
+	/**
+	 * 初始数据
+	 */
+	public String initial(String id);
+
+	/**
+	 * 计划员取消签名
+	 */
+	public String signPlanReturn(String id,String headId);
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/IncidentTicketServiceImpl.java

@@ -743,7 +743,7 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 		incidentTicketEntity.setUpdateTime(new Date());
 		incidentTicketMapper.updateById(incidentTicketEntity);
 //		this.save(incidentTicketEntity);
-		return Result.error("已通知");
+		return Result.ok("已通知");
 	}
 
 
@@ -770,7 +770,14 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 					return Result.error("您已通知，请勿重新操作");
 				}
 
-				o.setConfirm("已处理");
+				if(o.getConfirm().equals("否")){
+					o.setConfirm("已反馈");
+				}else{
+					if(!o.getConfirm().contains("已反馈")){
+						o.setConfirm(o.getConfirm()+"/已反馈");
+					}
+				}
+
 				o.setUpdateBy(sysUser.getUsername());
 				o.setUpdateTime(new Date());
 				incidentTicketMsgMapper.updateById(o);
@@ -789,7 +796,7 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 			incidentTicketMsg.setPkIncidentTicket(headId);
 			incidentTicketMsg.setUserId(sysUser.getUsername());
 			incidentTicketMsg.setUserName(sysUser.getRealname());
-			incidentTicketMsg.setConfirm("已处理-另");
+			incidentTicketMsg.setConfirm("已反馈-另");
 			iIncidentTicketMsgService.save(incidentTicketMsg);
 		}
 
@@ -808,10 +815,13 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 			incidentTicketMapper.updateById(incidentTicketEntity);
 //			this.save(incidentTicketEntity);
 //		}
-		return Result.ok("已通知");
+		return Result.ok("已反馈通知");
 	}
 
-
+	//		String aa = "qqq";
+//		String nn = "qwe,qqq";
+//
+//		System.out.println(nn.contains(aa));
 	@Override
 	@Transactional
 	public void saveMain(IncidentTicket incidentTicket, List<IncidentTicketChildren> incidentTicketChildrenList) {
@@ -839,7 +849,20 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 		List<IncidentTicketMsg> list = iIncidentTicketMsgService.list(query);
 		for(IncidentTicketMsg o:list){
 
+			if(o.getUserId().equals(sysUser.getUsername())){
+				if(o.getConfirm().equals("否")){
+					o.setConfirm("已处理");
+				}else{
+					if(!o.getConfirm().contains("已处理")){
+						o.setConfirm(o.getConfirm()+"/已处理");
+					}
+				}
 
+				o.setUpdateBy(sysUser.getUsername());
+				o.setUpdateTime(new Date());
+				incidentTicketMsgMapper.updateById(o);
+				break;
+			}
 
 		}
 

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/SyCarryServiceImpl.java

@@ -12,6 +12,7 @@ import org.jeecg.modules.oa.entity.SyCarryB;
 import org.jeecg.modules.oa.entity.SyCottonYarnB;
 import org.jeecg.modules.oa.mapper.SyCarryBMapper;
 import org.jeecg.modules.oa.mapper.SyCarryMapper;
+import org.jeecg.modules.oa.service.ISyCarryBService;
 import org.jeecg.modules.oa.service.ISyCarryService;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysUserService;
@@ -42,6 +43,8 @@ public class SyCarryServiceImpl extends ServiceImpl<SyCarryMapper, SyCarry> impl
 	private ISysBaseAPI iSysBaseAPI;
 	@Autowired
 	private ISysUserService sysUserService;
+	@Autowired
+	private ISyCarryBService iSyCarryBService;
 
 	@Override
 	@Transactional
@@ -394,13 +397,126 @@ public class SyCarryServiceImpl extends ServiceImpl<SyCarryMapper, SyCarry> impl
 	}
 */
 
+
+	@Override
+	@Transactional
+	public String initial(String id){
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		SyCarry syCarry = syCarryMapper.selectById(id);
+		List<SyCarryB> syCarryB = syCarryBMapper.selectByMainId(id);
+		if (syCarryB == null) {
+			return "数据不存在，请刷新后重试";
+		}
+		if (syCarry == null) {
+			return "数据不存在，请刷新后重试";
+		}
+		String syState = syCarry.getState();//0草稿，1仓库已提交（计划签字），2人事行政，3财务经理 ，4已完成
+		if(syState == "3" || syState == "4"){
+			return "财务已审批，无法此操作";
+		}
+
+		for(SyCarryB o:syCarryB){
+			o.setJhyBy(null);
+			o.setJhyName(null);
+			o.setJhyTime(null);
+			iSyCarryBService.lambdaUpdate().eq(SyCarryB::getId,o.getId())
+					.set(SyCarryB::getJhyBy,null).set(SyCarryB::getJhyName,null).set(SyCarryB::getJhyTime,null)
+					.update();
+//			syCarryBMapper.updateById(o);
+		}
+
+		syCarry.setState("0");//0草稿，1仓库已提交（计划签字），2人事行政，3财务经理 ，4已完成
+		syCarry.setCkBy(null);//仓库提交人
+		syCarry.setCkName(null);//仓库提交人
+		syCarry.setCkTime(null);//仓库提交人提交时间
+
+		syCarry.setRsxzBy(null);//人事行政提交人
+		syCarry.setRsxzName(null);//人事行政提交人
+		syCarry.setRsxzTime(null);//人事行政提交人提交时间
+		this.updateById(syCarry);
+		HashMap<String,Object> taskParam = new HashMap<>();
+		iSysBaseAPI.sendSysAnnouncement(loginUser,loginUser.getUsername(),syCarry.getCreateBy(),"搬运工对账单",
+				"您发起的搬运工对账单: "+syCarry.getName()+"，被"+loginUser.getPostName()+"驳回，请查看",
+				CommonConstant.MSG_CATEGORY_2,taskParam);
+
+		return "操作成功";
+	}
+
+
+
+	@Override
+	@Transactional
+	public String signPlanReturn(String id,String headId) {
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		SyCarry syCarry = syCarryMapper.selectById(headId);
+		SyCarryB syCarryB = syCarryBMapper.selectById(id);
+		if (syCarryB == null) {
+			return "数据不存在，请刷新后重试";
+		}
+		if (syCarry == null) {
+			return "数据不存在，请刷新后重试";
+		}
+		String jhyByData = syCarryB.getJhyByData();
+		String jhyBy = syCarryB.getJhyBy();
+		String jhyName = syCarryB.getJhyName();
+
+		if (StringUtils.isBlank(jhyByData)) {
+			return "计划员为空，该数据不合法";
+		}
+
+		if (!jhyByData.contains(loginUser.getUsername())) {
+			return "您无权操作此条数据";
+		}
+		if (!jhyBy.contains(loginUser.getUsername())) {
+			return "您还未签名，无需取消";
+		}
+
+		String syState = syCarry.getState();//0草稿，1仓库已提交（计划签字），2人事行政，3财务经理 ，4已完成
+		if(syState != "1" && syState != "0"){
+			return "单据已审批，无法取消";
+		}
+
+		String[] jhyByList = jhyBy.split(",");
+		String[] jhyNameList = jhyName.split("/");
+
+		String jhyB = "";
+		String jhyN = "";
+		for(String o:jhyByList){
+			if(o.equals(loginUser.getUsername())){
+				continue;
+			}
+			if(StringUtils.isBlank(jhyB)){
+				jhyB = o;
+			}else{
+				jhyB = jhyB+","+o;
+			}
+		}
+		for(String o:jhyNameList){
+			if(o.equals(loginUser.getRealname())){
+				continue;
+			}
+			if(StringUtils.isBlank(jhyN)){
+				jhyN = o;
+			}else{
+				jhyN = jhyN+","+o;
+			}
+		}
+
+		syCarryB.setJhyBy(jhyB);
+		syCarryB.setJhyName(jhyN);
+		syCarryBMapper.updateById(syCarryB);
+
+		return "取消成功";
+
+	}
+
 	@Override
 	@Transactional
 	public String signPlan(String id) {
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		SyCarryB syCarryB = syCarryBMapper.selectById(id);
 		if(syCarryB == null){
-			return "数据存在，请刷新后重试";
+			return "数据不存在，请刷新后重试";
 		}
 		String jhyByData = syCarryB.getJhyByData();
 		String jhyBy = syCarryB.getJhyBy();
@@ -471,9 +587,25 @@ public class SyCarryServiceImpl extends ServiceImpl<SyCarryMapper, SyCarry> impl
 
 
 	public static void main(String[] args) {
-		String ch = "T00011";
-		String s = "T0001,T0002";
-		System.out.println(DateUtils.getDate("yyyy-MM-dd HH:mm:ss"));
+		String jhyName = "刘静剑/余兴志";
+		String jhyBy = "T0090,T0089,T0090,T0090";
+//		System.out.println();
+		String[] jhyByList = jhyBy.split(",");
+		String[] jhyNameList = jhyName.split("/");
+
+		String jhy = "";
+		for(String o:jhyByList){
+			if(o.equals("T0089")){
+				continue;
+			}
+			if(StringUtils.isBlank(jhy)){
+				jhy = o;
+			}else{
+				jhy = jhy+","+o;
+			}
+		}
+
+		System.out.println(jhy);
 
 	}
 

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/job/CdScheduleJob.java

@@ -0,0 +1,66 @@
+package org.jeecg.modules.quartz.job;
+
+import io.micrometer.core.instrument.util.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.oa.entity.CdSchedule;
+import org.jeecg.modules.oa.mapper.CdScheduleMapper;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 日程计划提醒
+ */
+@Slf4j
+public class CdScheduleJob implements Job {
+    @Autowired
+    private CdScheduleMapper cdScheduleMapper;
+    @Autowired
+    private ISysBaseAPI sysBaseAPI;
+    @Override
+    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+
+		try {
+			List<CdSchedule> list = cdScheduleMapper.getListByUser("");
+
+			if(list.size() > 0){
+
+			    for(CdSchedule o:list){
+                    StringBuffer sb = new StringBuffer();
+                    StringBuffer sb2 = new StringBuffer();
+                    sb.append("您好： 您今天有1条新的日程计划，请及时查看。");
+                    sb2.append("标题：").append(o.getTitle()).append("  日程时间："+new SimpleDateFormat("yyyy-MM-dd").format(o.getStartTime()));
+                    sb2.append("/"+new SimpleDateFormat("yyyy-MM-dd").format(o.getEndTime()));
+                    if(o.getPlanTime() != null){
+                        sb2.append("  时间：").append(new SimpleDateFormat("HH:mm:ss").format(o.getPlanTime())+"；");
+                    }
+                    if(StringUtils.isNotBlank(o.getType())){
+                        sb2.append("【"+o.getType()+"】");
+                    }
+                    if(StringUtils.isNotBlank(o.getDegreeOfUrgency())){
+                        sb2.append("【"+o.getDegreeOfUrgency()+"】");
+                    }
+
+                    LoginUser loginUser = sysBaseAPI.getUserByName("admin");
+                    sysBaseAPI.sendSysAnnouncement(loginUser,"admin",o.getCreateBy(),"日程计划提醒",
+                            "<h3>"+sb.toString()+"</h3><br> <h4><br>"+sb2.toString()+"</h4>",
+                            CommonConstant.MSG_CATEGORY_2,new HashMap<>());
+                    cdScheduleMapper.updateInfoNum("");
+                }
+
+			}
+		}catch (Exception e){
+			System.out.println("日程消息发送失败："+e.getMessage());
+		}
+
+    }
+
+}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java

@@ -306,39 +306,39 @@ public class SysAnnouncementController {
 		String username = sysUser.getUsername();
 		String pkOrg = sysUser.getPkOrg();
 
-		try {
-			List<CdSchedule> list = cdScheduleMapper.getListByUser(username);
-
-			if(list.size() > 0){
-				StringBuffer sb = new StringBuffer();
-				StringBuffer sb2 = new StringBuffer();
-				sb.append("亲爱的用户：").append(sysUser.getRealname()).append("，您今天有"+list.size()+"条新的日程计划，请及时查看。");
-				int ind = 1;
-				for (CdSchedule o:list){
-					sb2.append(ind+"、标题：").append(o.getTitle()).append("  日程时间："+new SimpleDateFormat("yyyy-MM-dd").format(o.getStartTime()));
-					sb2.append("/"+new SimpleDateFormat("yyyy-MM-dd").format(o.getEndTime()));
-					if(o.getPlanTime() != null){
-						sb2.append("  时间：").append(new SimpleDateFormat("HH:mm:ss").format(o.getPlanTime())+"；");
-					}
-					if(StringUtils.isNotBlank(o.getType())){
-						sb2.append("【"+o.getType()+"】");
-					}
-					if(StringUtils.isNotBlank(o.getDegreeOfUrgency())){
-						sb2.append("【"+o.getDegreeOfUrgency()+"】");
-					}
-
-					ind++;
-				}
-
-				LoginUser loginUser = sysBaseAPI.getUserByName("admin");
-				sysBaseAPI.sendSysAnnouncement(loginUser,"admin",username,"日程计划提醒",
-						"<h3>"+sb.toString()+"</h3><br> <h4><br>"+sb2.toString()+"</h4>",
-						CommonConstant.MSG_CATEGORY_2,new HashMap<>());
-				cdScheduleMapper.updateInfoNum(username);
-			}
-		}catch (Exception e){
-			System.out.println("日程消息发送失败："+e.getMessage());
-		}
+//		try {
+//			List<CdSchedule> list = cdScheduleMapper.getListByUser(username);
+//
+//			if(list.size() > 0){
+//				StringBuffer sb = new StringBuffer();
+//				StringBuffer sb2 = new StringBuffer();
+//				sb.append("亲爱的用户：").append(sysUser.getRealname()).append("，您今天有"+list.size()+"条新的日程计划，请及时查看。");
+//				int ind = 1;
+//				for (CdSchedule o:list){
+//					sb2.append(ind+"、标题：").append(o.getTitle()).append("  日程时间："+new SimpleDateFormat("yyyy-MM-dd").format(o.getStartTime()));
+//					sb2.append("/"+new SimpleDateFormat("yyyy-MM-dd").format(o.getEndTime()));
+//					if(o.getPlanTime() != null){
+//						sb2.append("  时间：").append(new SimpleDateFormat("HH:mm:ss").format(o.getPlanTime())+"；");
+//					}
+//					if(StringUtils.isNotBlank(o.getType())){
+//						sb2.append("【"+o.getType()+"】");
+//					}
+//					if(StringUtils.isNotBlank(o.getDegreeOfUrgency())){
+//						sb2.append("【"+o.getDegreeOfUrgency()+"】");
+//					}
+//
+//					ind++;
+//				}
+//
+//				LoginUser loginUser = sysBaseAPI.getUserByName("admin");
+//				sysBaseAPI.sendSysAnnouncement(loginUser,"admin",username,"日程计划提醒",
+//						"<h3>"+sb.toString()+"</h3><br> <h4><br>"+sb2.toString()+"</h4>",
+//						CommonConstant.MSG_CATEGORY_2,new HashMap<>());
+//				cdScheduleMapper.updateInfoNum(username);
+//			}
+//		}catch (Exception e){
+//			System.out.println("日程消息发送失败："+e.getMessage());
+//		}
 
 		// 1.将系统消息补充到用户通告阅读标记表中
 		Collection<String> anntIds = sysAnnouncementSendService.queryByUserId(userId);

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -112,8 +112,8 @@ public class SysUserController {
 //		queryWrapper.like(StringUtils.isNotBlank(realname),"realname",realname);
 		Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
 		//根据公司id过滤
-        LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.lambda().like(SysUser::getPkOrg,sysUser.getOrgCode());
+//        LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+//        queryWrapper.lambda().like(SysUser::getPkOrg,sysUser.getOrgCode());
         if(StringUtils.isNotBlank(syHireType) && syHireType.equals("在职")){
             queryWrapper.last("and IFNULL(sy_Hire_Type,'在职') !='离职' order by substring_index(work_no, '-', 1) + 0 asc,work_no asc");
         }else{

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -74,7 +74,7 @@ public class SysUser implements Serializable {
      * 生日
      */
     @Excel(name = "生日", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+12", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date birthday;
 

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -76,7 +76,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             return Result.error("两次输入密码不一致!");
         }
         String password = PasswordUtil.encrypt(username, newpassword, user.getSalt());
-        this.userMapper.update(new SysUser().setPassword(password), new LambdaQueryWrapper<SysUser>().eq(SysUser::getId, user.getId()));
+		String password2 = MD5Util.MD5Encode(newpassword,"");
+        this.userMapper.update(new SysUser().setPassword(password).setPassword2(password2), new LambdaQueryWrapper<SysUser>().eq(SysUser::getId, user.getId()));
         return Result.ok("密码重置成功!");
     }