111

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

@@ -12,5 +12,5 @@
 		SELECT * 
 		FROM  incident_ticket_children
 		WHERE
-			 incident_ticket_id = #{mainId} order by sort</select>
+			 incident_ticket_id = #{mainId} order by sort + 0</select>
 </mapper>

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

@@ -540,7 +540,7 @@ public class SysDictController {
 	}
 
 	/**
-	 *
+	 *public List<DictModel> queryReportByTable(@Param("tableName") String tableName);
 	 */
 	@RequestMapping(value = "/selectDictByJiMuPrint", method = RequestMethod.GET)
 	public DictModel selectDictByJiMuPrint(String tableName){
@@ -553,6 +553,29 @@ public class SysDictController {
 		}
 
 	}
+	/**
+	 *public List<DictModel> queryReportByTable(@Param("tableName") String tableName);
+	 */
+	@RequestMapping(value = "/queryReportByTable", method = RequestMethod.GET)
+	public Map<String,Integer> queryReportByTable(String tableName){
+		Map<String,Integer> map = new HashMap();
+		try {
+
+			List<DictModel> sysdict= sysDictService.queryReportByTable(tableName);
+			for(DictModel o:sysdict){
+				try {
+					map.put(o.getText(),Integer.valueOf(o.getValue()));
+				}catch (Exception e){
+					map.put(o.getText(),180);
+				}
+
+			}
+			return map;
+		}catch (Exception e){
+			return map;
+		}
+
+	}
 
 
 	/**

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

@@ -173,7 +173,7 @@ public class SysUserController {
 									  @RequestParam(name="pageSize", defaultValue="300") Integer pageSize,HttpServletRequest req) {
 		Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
 //		String deptName = user.getDeptName();
-		String[] deptName = {"人事","后勤部","财务一部"};//user.getDeptName();
+		String[] deptName = {"人事","财务一部"};//user.getDeptName();
         user.setDeptName(null);
 
         String syHireType = user.getSyHireType();
@@ -184,11 +184,8 @@ public class SysUserController {
 		//根据公司id过滤
 //        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{
-            queryWrapper.last("order by substring_index(work_no, '-', 1) + 0 asc,work_no asc");
-        }
+        queryWrapper.last("and realname !='崔崇杰' and IFNULL(sy_Hire_Type,'在职') !='离职' order by substring_index(work_no, '-', 1) + 0 asc,work_no asc");
+
         List<String> deptList = new ArrayList<>();
         for(String o:deptName){
             SysUser user2 = new SysUser();

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java

@@ -41,6 +41,7 @@ public interface SysDictMapper extends BaseMapper<SysDict> {
 	public String queryTableDictTextByKey(@Param("table") String table,@Param("text") String text,@Param("code") String code,@Param("key") String key);
 
 	public DictModel selectDictByJiMuPrint(@Param("tableName") String tableName);
+	public List<DictModel> queryReportByTable(@Param("tableName") String tableName);
 
 	public List<DictModel> queryTableDictByKeys(@Param("table") String table, @Param("text") String text, @Param("code") String code, @Param("keyArray") String[] keyArray);
 

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

@@ -29,7 +29,9 @@
 			where ${filterSql}
 		</if>
 	</select>
-	
+
+
+
 	<!--通过查询指定table的 text code key 获取字典值-->
 	<select id="queryTableDictTextByKey" parameterType="String" resultType="String">
 		   select ${text} as "text" from ${table} where ${code}= #{key}
@@ -39,7 +41,14 @@
 		select item_value as "text",description as "value"  from sys_dict_item where dict_id in(select id from sys_dict where dict_code='jimu_print')
 		and item_text=#{tableName}
 	</select>
-	
+
+	<select id="queryReportByTable" parameterType="String"  resultType="org.jeecg.common.system.vo.DictModel">
+		select field_name as "text", replace_val as "value" FROM
+			onl_cgreport_item
+		WHERE
+			cgrhead_id	in(select id from onl_cgreport_head where code=#{tableName})
+	</select>
+
 	<!--通过查询指定table的 text code key 获取字典值，包含value-->
 	<select id="queryTableDictByKeys" parameterType="String" resultType="org.jeecg.common.system.vo.DictModel">
 		select ${text} as "text", ${code} as "value" from ${table} where ${code} in

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

@@ -33,6 +33,7 @@ public interface ISysDictService extends IService<SysDict> {
 	List<String> queryTableDictByKeys(String table, String text, String code, String[] keyArray);
 
 	public DictModel selectDictByJiMuPrint(String tableName);
+	public List<DictModel> queryReportByTable(String tableName);
     /**
      * 根据字典类型删除关联表中其对应的数据
      *

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

@@ -50,6 +50,10 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 	public DictModel selectDictByJiMuPrint(String tableName) {
 		return sysDictMapper.selectDictByJiMuPrint(tableName);
 	}
+	@Override
+	public List<DictModel> queryReportByTable(String tableName) {
+		return sysDictMapper.queryReportByTable(tableName);
+	}
 
 	/**
 	 * 通过查询指定code 获取字典