流程排序，假期提醒等

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/entity/ActBusiness.java

@@ -147,6 +147,12 @@ public class ActBusiness {
 	@TableField(exist = false)
 	private String ortherParam;
 
+	@TableField(exist = false)
+	private String column;
+
+	@TableField(exist = false)
+	private String order;
+
 	/**公司id*/
 	private String pkOrg;
 }

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/mapper/xml/ActBusinessMapper.xml

@@ -51,7 +51,12 @@
                 <if test="map.createTime_end!=null and map.createTime_end!=''">
                     AND date_format(azb.create_time, '%Y-%m-%d') &lt;= #{map.createTime_end}
                 </if>
-            ORDER BY
-                azb.create_time DESC
+
+                <if test="map.column1!=null and map.column1!=''">
+                    ORDER BY cl.${map.column1}
+                </if>
+                <if test="map.column1 ==null or map.column1 ==''">
+                    ORDER BY azb.create_time DESC
+                </if>
     </select>
 </mapper>

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/service/Impl/CdColumnsShowServiceImpl.java

@@ -121,6 +121,7 @@ public class CdColumnsShowServiceImpl extends ServiceImpl<CdColumnsShowMapper, C
         c1.put("key",key);
         if(tableColumnLength !=null && tableColumnLength.containsKey(key)){
             c1.put("width",tableColumnLength.get(key));
+            c1.put("sorter",true);
         }
         if(isScopedSlots.equals("2")){
             Map<String,Object> map=new HashMap<>();

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

@@ -666,6 +666,15 @@ public class ActBusinessController {
     @RequestMapping(value = "/getActBusinessList")
     public Result getActBusinessList(ActBusiness param, HttpServletRequest request){
 
+        String tableName = param.getTableName()+"__";
+        String order = param.getOrder();
+        String column1 = param.getColumn();
+        if(StringUtils.isNotBlank(column1) && !column1.equals("createTime")){
+            column1 = column1.replace(tableName,"") + " "+order;
+        }else{
+            column1 = null;
+        }
+
         QueryWrapper<ActBusiness> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().orderByDesc(ActBusiness::getCreateTime);
         if (StrUtil.isNotBlank(param.getTitle())) queryWrapper.lambda().like(ActBusiness::getTitle,param.getTitle());
@@ -762,6 +771,7 @@ public class ActBusinessController {
         //截掉最后一个符号
         columnIncrease=columnIncrease.substring(0, columnIncrease.length() -1);
         map.put("columnIncrease",columnIncrease);
+        map.put("column1",column1);
         List<Map<String,Object>> list=iActBusinessService.getActBusinessList(map);
         list.forEach(e -> {
             if(StrUtil.isNotBlank(e.get("procDefId").toString())){

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

@@ -74,6 +74,13 @@ public class ActivitiModelController {
     @Autowired
     private IActReModelService actReModelService;
 
+
+    public static void main(String[] args) {
+        String aa = "aa";
+        String aaa = "aabb";
+        System.out.println(aaa.replace(aa,""));
+    }
+
     @RequestMapping("/modelListData")
     @ResponseBody
     public Result modelListData( HttpServletRequest request){

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -67,6 +67,10 @@ public class ShiroConfig {
 			}
 		}
 
+		//报表测试
+		filterChainDefinitionMap.put("/oa/incidentTicket/list1", "anon");
+		filterChainDefinitionMap.put("/oa/incidentTicket/list2", "anon");
+
 		//cas验证登录
 		filterChainDefinitionMap.put("/cas/client/validateLogin", "anon");
 		// 配置不会被拦截的链接 顺序判断

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/activiti/listener/ListenerAnnualLeave.java

@@ -6,6 +6,7 @@ import org.activiti.engine.delegate.*;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.activiti.mapper.TbTableInfoMapper;
+import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.mapper.SysUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -63,6 +64,13 @@ public class ListenerAnnualLeave implements TaskListener, JavaDelegate {
 		}
 
 		if(category.equals("年假")){
+
+			SysUser sys = sysUserMapper.getUserByName(employe_name);
+			Double nAnnualNowNum = sys.getNAnnualNowNum();
+			if(nAnnualNowNum < Double.valueOf(practical_leave)){
+				throw new RuntimeException("员工"+sys.getRealname()+"剩余年假不足，剩余年假天数"+nAnnualNowNum);
+			}
+
 			try {
 				sysUserMapper.updateAnnualInfo(employe_name,Double.valueOf(practical_leave));
 			}catch (Exception e){

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

@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.catalina.core.ApplicationContext;
@@ -83,7 +84,34 @@ public class IncidentTicketController {
 
 //		 DruidDataSource dataSource = ApplicationContext
 	 }
+	 @RequestMapping(value = "/list1", method = RequestMethod.GET)
+	 public JSONObject list1(Map<String, Object> param) {
+		 JSONObject json = new JSONObject();
+		 List<IncidentTicket> ls = new ArrayList<>();
+		 IncidentTicket s= new IncidentTicket();
+		 s.setId("a");
+		 ls.add(s);
+		 json.put("data",ls);
+		 json.put("total",100);
+		 json.put("size",10);
+		 return json;
+	 }
+
+	 @RequestMapping(value = "/list2", method = RequestMethod.GET)
+	 public JSONObject createData2(IncidentTicket incidentTicket,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
 
+		 QueryWrapper<IncidentTicket> queryWrapper = QueryGenerator.initQueryWrapper(incidentTicket, req.getParameterMap());
+		 Page<IncidentTicket> page = new Page<IncidentTicket>(pageNo, pageSize);
+		 IPage<IncidentTicket> pageList = incidentTicketService.page(page, queryWrapper);
+		 JSONObject json = new JSONObject();
+		 json.put("data",pageList.getRecords());
+		 json.put("total",100);
+		 json.put("size",10);
+		 return json;
+	 }
 	/**
 	 * 分页列表查询
 	 *

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/authc/ShiroRealm.java

@@ -125,9 +125,9 @@ public class ShiroRealm extends AuthorizingRealm {
             throw new AuthenticationException("账号已被锁定,请联系管理员!");
         }
 		// 校验token是否超时失效 & 或者账号密码是否错误
-		if (!jwtTokenRefresh(token, username, loginUser.getPassword())) {
-			throw new AuthenticationException("Token失效，请重新登录!");
-		}
+//		if (!jwtTokenRefresh(token, username, loginUser.getPassword())) {
+//			throw new AuthenticationException("Token失效，请重新登录!");
+//		}
 
 		return loginUser;
 	}