格克

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userShift/controller/UserShiftController.java

@@ -171,6 +171,7 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
    */
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, UserShift userShift) {
+
       return super.exportXls(request, userShift, UserShift.class, "员工排班");
   }
 
@@ -191,13 +192,13 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 			  params.setTitleRows(2);
 			  params.setHeadRows(1);
 			  params.setNeedSave(true);
-			  String date="2022-06";
 			  try {
 			  	List<UserShift>ls=new ArrayList<>();
 				  List<UserShiftExcel> list = ExcelImportUtil.importExcel(file.getInputStream(), UserShiftExcel.class, params);
 				  for(UserShiftExcel o:list){
 					 if (oConvertUtils.isNotEmpty(o.getWorkNo())&&oConvertUtils.isNotEmpty(o.getMoth())){
 						 String userId = userShiftService.getUserId(o.getWorkNo());
+						 userShiftService.deleteUserShift(userId,o.getMoth()+"-01");
 						 if (oConvertUtils.isNotEmpty(userId)) {
 							 if (oConvertUtils.isNotEmpty(o.getA1())) {
 								 UserShift u = new UserShift();
@@ -206,6 +207,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA1());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA1().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA1().equals("法")){
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -215,9 +218,11 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 u.setUserId(userId);
 								 u.setShiftDate(DateUtils.parseDate(o.getMoth()+"-02","yyyy-MM-dd"));
 								 String shiftId = userShiftService.getShiftId(o.getA2());
-								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA1().equals("休")) {
+								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA2().equals("休")) {
 									 u.setShiftId(shiftId);
-								 }else {
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA1().equals("法")) {
+									 u.setShiftId("1");
+								 } else {
 									 u.setShiftId("0");
 								 }
 								 ls.add(u);
@@ -228,7 +233,9 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA3());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA3().equals("休")) {
 									 u.setShiftId(shiftId);
-								 }else {
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA3().equals("法")) {
+									 u.setShiftId("1");
+								 } else {
 									 u.setShiftId("0");
 								 }
 								 ls.add(u);
@@ -239,7 +246,9 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA4());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA4().equals("休")) {
 									 u.setShiftId(shiftId);
-								 }else {
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA4().equals("法")) {
+									 u.setShiftId("1");
+								 } else {
 									 u.setShiftId("0");
 								 }
 								 ls.add(u);
@@ -250,6 +259,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA5());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA5().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA5().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -261,6 +272,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA6());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA6().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA6().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -272,6 +285,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA7());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA7().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA7().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -283,6 +298,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA8());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA8().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA8().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -294,6 +311,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA9());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA9().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA9().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -305,6 +324,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA10());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA10().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA10().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -316,6 +337,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA11());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA11().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA11().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -327,6 +350,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA12());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA12().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA12().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -338,6 +363,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA13());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA13().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA13().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -349,6 +376,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA14());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA14().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA14().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -360,6 +389,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA15());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA15().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA15().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -371,6 +402,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA16());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA16().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA16().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -382,6 +415,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA17());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA17().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA17().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -393,6 +428,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA18());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA18().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA18().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -404,6 +441,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA19());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA19().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA19().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -415,6 +454,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA20());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA20().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else  if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA20().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -426,6 +467,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA21());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA21().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA21().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -437,6 +480,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA22());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA22().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA22().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -448,6 +493,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA23());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA23().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA23().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -459,6 +506,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA23());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA23().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA23().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -470,6 +519,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA24());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA24().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA24().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -481,6 +532,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA25());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA25().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else  if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA25().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -492,6 +545,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA26());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA26().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else  if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA26().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -503,6 +558,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA27());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA27().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA27().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -514,6 +571,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA28());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA28().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA28().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -525,6 +584,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA30());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA30().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA30().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -536,6 +597,8 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 								 String shiftId = userShiftService.getShiftId(o.getA31());
 								 if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA31().equals("休")) {
 									 u.setShiftId(shiftId);
+								 }else if (oConvertUtils.isNotEmpty(shiftId)&&!o.getA31().equals("法")) {
+									 u.setShiftId("1");
 								 }else {
 									 u.setShiftId("0");
 								 }
@@ -571,9 +634,14 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 
 	 @GetMapping(value = "/UserShiftType")
 	 public Result<?> UserShiftType(UserShift userShift) throws ParseException {
-
-		 String userShiftType = userShiftService.getUserShiftType(DateUtils.formatDate(userShift.getShiftDate()), userShift.getUserId());
-		 return Result.OK(userShiftType);
+	  	List<String>dates=null;
+	  	if (oConvertUtils.isNotEmpty(userShift.getShiftId())){
+			String substring = userShift.getShiftId().substring(0, userShift.getShiftId().length() - 1);
+			dates=Arrays.asList(substring.split(","));
+		}
+		 Map<String, Integer> map = userShiftService.shiftCount(dates, userShift.getUserId());
+		// String userShiftType = userShiftService.getUserShiftType(DateUtils.formatDate(userShift.getShiftDate()), userShift.getUserId());
+		 return Result.OK(map);
 	 }
 
 

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userShift/entity/UserShiftExcel.java

@@ -30,6 +30,9 @@ public class UserShiftExcel implements java.io.Serializable {
 	@Excel(name = "姓名", width = 15)
 	private String name;
 
+	@Excel(name = "部门", width = 15)
+	private String depname;
+
 	@Excel(name = "1号", width = 15)
 	private String a1;
 

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userShift/mapper/UserShiftMapper.java

@@ -68,5 +68,7 @@ public interface UserShiftMapper extends BaseMapper<UserShift> {
   String getUserId(@Param("code")String code);
 
   String getShiftId(@Param("name")String name);
+
+  List<String>getShiftList(@Param("dates") List<String>dates,@Param("userid") String userid);
 }
 

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userShift/mapper/xml/UserShiftMapper.xml

@@ -68,7 +68,7 @@ order by a.shift_date desc
         order by date_format(a.shift_date,'%Y-%m-%d') asc
     </select>
     <select id="getUsers" resultType="java.util.Map">
-    select distinct a.id as 'rid',type,a.user_id as 'id', a.work_day as'workDay',b.realname,a.start_date as'startDate',a.end_date as'endDate'
+    select distinct a.id as 'rid',type,a.user_id as 'id', a.work_day as'workDay',b.realname,a.start_date as'startDate',a.end_date as'endDate',b.work_no as 'workNo'
     from geke_attendance_rule a
     left join sys_user b on a.user_id=b.id
     left join sys_user_depart c on b.id=c.user_id
@@ -90,7 +90,8 @@ order by a.shift_date desc
             and d.id= #{dept}
         </if>
 <if test="date!=null and ''!=date">
-    and(b.employment_status='10' or date_format(b.term_Date,'%Y-%m')>=date_format(#{date},'%Y-%m'))
+    and ((b.employment_status='30' and date_format(b.term_Date,'%Y-%m')>=date_format(#{date},'%Y-%m')) or	(date_format(#{date},'%Y-%m')>=date_format(b.entry_Date,'%Y-%m') and b.employment_status='10'))
+
 </if>
     </select>
     <delete id="deleteUserids">
@@ -228,4 +229,16 @@ order by a.shift_date desc
             and name=#{name}
         </if>
     </select>
+    <select id="getShiftList" resultType="java.lang.String">
+        select shift_id from geke_user_shift where 1=1
+        <if test="dates!=null and dates.size()>0">
+            and  date_format(shift_date,'%Y-%m-%d') in
+            <foreach collection="dates" index="index" item="id" open="(" separator="," close=")">
+                date_format(#{id},'%Y-%m-%d')
+            </foreach>
+        </if>
+<if test="userid!=null and ''!=userid">
+    and user_id=#{userid}
+</if>
+    </select>
 </mapper>

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userShift/service/IUserShiftService.java

@@ -53,4 +53,6 @@ public interface IUserShiftService extends IService<UserShift> {
     String getUserId(String code);
 
     String getShiftId(String name);
+
+    Map<String,Integer>shiftCount(List<String>dates,String userid);
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userShift/service/impl/UserShiftServiceImpl.java

@@ -319,9 +319,8 @@ public class UserShiftServiceImpl extends ServiceImpl<UserShiftMapper, UserShift
         List<Map<String,Object>> oneUserShift = userShiftMapper.getOneUserShift(userid, date,"");
         String type="0";
         if (oneUserShift!=null&&oneUserShift.size()>0){
-            if (!oneUserShift.get(0).get("id").equals("0")) {
-                type="1";
-            }
+                type=oneUserShift.get(0).get("id").toString();
+
         }
         return type;
     }
@@ -335,4 +334,25 @@ public class UserShiftServiceImpl extends ServiceImpl<UserShiftMapper, UserShift
     public String getShiftId(String name) {
         return userShiftMapper.getShiftId(name);
     }
+
+    @Override
+    public Map<String, Integer> shiftCount(List<String> dates, String userid) {
+        Integer count=0;
+        Integer counts=0;
+        Map<String,Integer>map=new HashMap<>();
+        List<String> shiftList = userShiftMapper.getShiftList(dates, userid);
+        if (shiftList!=null&&shiftList.size()>0){
+            for (String s : shiftList) {
+                if (s.equals("0")||s.equals("1")){
+                    count++;
+                }else {
+                    counts++;
+                }
+            }
+
+        }
+        map.put("count",count);
+        map.put("counts",counts);
+        return map;
+    }
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userchange/controller/UserChageController.java

@@ -7,6 +7,7 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -70,13 +71,38 @@ public class UserChageController extends JeecgController<UserChage, IUserChageSe
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
+		QueryWrapper<UserChage> queryWrapper = QueryGenerator.initQueryWrapper(userChage, req.getParameterMap());
+		Page<UserChage> page = new Page<UserChage>(pageNo, pageSize);
+		String startDate="";
+		String endDate="";
+		String state="";
+		List<OrderItem>orderItems=new ArrayList<>();
+		if (queryWrapper.getExpression().getOrderBy()!=null&&queryWrapper.getExpression().getOrderBy().size()>0){
+			String[] s = queryWrapper.getExpression().getOrderBy().get(0).getSqlSegment().split(" ");
+			OrderItem orderItem=new OrderItem();
+			orderItem.setColumn(s[0]);
+			orderItem.setAsc(true);
+			if (s[1].equals("DESC")){
+				orderItem.setAsc(false);
+			}if (s[0].equals("create_time")){
+				orderItem.setColumn("time");
+			}
+			orderItems.add(orderItem);
+		}
+		page.setOrders(orderItems);
 		if(oConvertUtils.isNotEmpty(userChage.getRealname())){
 			userChage.setRealname(userChage.getRealname().trim());
+		}if (oConvertUtils.isNotEmpty(userChage.getNewDeptName())&&!userChage.getNewDeptName().equals(",")){
+			String[] split = userChage.getNewDeptName().split(",");
+			startDate=split[0];
+			endDate=split[1];
+		}if (oConvertUtils.isNotEmpty(userChage.getState())){
+			state=userChage.getState().toString();
 		}
-		QueryWrapper<UserChage> queryWrapper = QueryGenerator.initQueryWrapper(userChage, req.getParameterMap());
-		Page<UserChage> page = new Page<UserChage>(pageNo, pageSize);
-		IPage<UserChage> pageList = userChageService.page(page, queryWrapper);
-		return Result.OK(pageList);
+
+		Page<UserChage> lists = userChageService.lists(page, userChage.getRealname(), userChage.getType(), state, startDate, endDate);
+		//IPage<UserChage> pageList = userChageService.page(page, queryWrapper);
+		return Result.OK(lists);
 	}
 	
 	/**
@@ -156,9 +182,40 @@ public class UserChageController extends JeecgController<UserChage, IUserChageSe
    * @param userChage
    */
   @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, UserChage userChage) {
+  public ModelAndView exportXls(UserChage userChage,HttpServletRequest request,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+	  Page<UserChage> page = new Page<UserChage>(1, 10000);
+	  QueryWrapper<UserChage> queryWrapper = QueryGenerator.initQueryWrapper(userChage, request.getParameterMap());
+	  String startDate="";
+	  String endDate="";
+	  String state="";
+	  List<OrderItem>orderItems=new ArrayList<>();
+	  if (queryWrapper.getExpression().getOrderBy()!=null&&queryWrapper.getExpression().getOrderBy().size()>0){
+		  String[] s = queryWrapper.getExpression().getOrderBy().get(0).getSqlSegment().split(" ");
+		  OrderItem orderItem=new OrderItem();
+		  orderItem.setColumn(s[0]);
+		  orderItem.setAsc(true);
+		  if (s[1].equals("DESC")){
+			  orderItem.setAsc(false);
+		  }if (s[0].equals("create_time")){
+			  orderItem.setColumn("time");
+		  }
+		  orderItems.add(orderItem);
+	  }
+	  page.setOrders(orderItems);
+	  if(oConvertUtils.isNotEmpty(userChage.getRealname())){
+		  userChage.setRealname(userChage.getRealname().trim());
+	  }if (oConvertUtils.isNotEmpty(userChage.getNewDeptName())&&!userChage.getNewDeptName().equals(",")){
+		  String[] split = userChage.getNewDeptName().split(",");
+		  startDate=split[0];
+		  endDate=split[1];
+	  }if (oConvertUtils.isNotEmpty(userChage.getState())){
+		  state=userChage.getState().toString();
+	  }
+
+	  Page<UserChage> lists = userChageService.lists(page, userChage.getRealname(), userChage.getType(), state, startDate, endDate);
 	  LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-	  List<UserChage>list=new ArrayList<>();
+	  //List<UserChage>list=new ArrayList<>();
 	  ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
 	  mv.addObject(NormalExcelConstants.FILE_NAME, "薪资调整列表"); //此处设置的filename无效 ,前端会重更新设置一下
 	  mv.addObject(NormalExcelConstants.CLASS, UserChage.class);
@@ -167,7 +224,7 @@ public class UserChageController extends JeecgController<UserChage, IUserChageSe
 	  exportParams.setImageBasePath(upLoadPath);
 	  //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
 	  mv.addObject(NormalExcelConstants.PARAMS,exportParams);
-	  mv.addObject(NormalExcelConstants.DATA_LIST,list);
+	  mv.addObject(NormalExcelConstants.DATA_LIST,lists.getRecords());
       return mv;
   }
 

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userchange/entity/UserChage.java

@@ -33,46 +33,58 @@ public class UserChage {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
 	private java.lang.String id;
+
+	@Excel(name = "工号", width = 15)
+	private java.lang.String workNo;
+
+	@Excel(name = "姓名", width = 15)
+	@ApiModelProperty(value = "员工姓名")
+	private java.lang.String realname;
 	/**变动类型*/
-    @ApiModelProperty(value = "变动类型")
+	@Excel(name = "类型", width = 15)
+	@ApiModelProperty(value = "变动类型")
 	private java.lang.String type;
 	/**部门名称*/
-    @ApiModelProperty(value = "部门名称")
+	@Excel(name = "原部门", width = 15)
+	@ApiModelProperty(value = "部门名称")
 	private java.lang.String deptName;
+	@Excel(name = "新部门", width = 15)
+	private java.lang.String newDeptName;
 	/**部门id*/
     @ApiModelProperty(value = "部门id")
 	private java.lang.String deptId;
 	/**员工id*/
-	@Excel(name = "*工号", width = 15)
     @ApiModelProperty(value = "员工id")
 	private java.lang.String userId;
 	/**员工姓名*/
-    @ApiModelProperty(value = "员工姓名")
-	private java.lang.String realname;
+
 	/**原职位*/
-    @ApiModelProperty(value = "原职位")
+	@Excel(name = "原职位", width = 15)
+	@ApiModelProperty(value = "原职位")
 	private java.lang.String startPost;
 	/**调整后职位*/
-    @ApiModelProperty(value = "调整后职位")
+	@Excel(name = "新职位", width = 15)
+	@ApiModelProperty(value = "调整后职位")
 	private java.lang.String endPost;
 	/**原薪资*/
 
+	@Excel(name = "原薪资", width = 15)
     @ApiModelProperty(value = "原薪资")
 	private java.lang.String startWages;
 	/**调整后薪资*/
-	@Excel(name = "*调整后薪资", width = 15)
+	@Excel(name = "调整后薪资", width = 15)
     @ApiModelProperty(value = "调整后薪资")
 	private java.lang.String endWages;
 	/**新部门id*/
 	private java.lang.String newDeptId;
 	/**新部门名称*/
-	private java.lang.String newDeptName;
+
 	/**提交人*/
     @ApiModelProperty(value = "提交人")
 	@Dict(dicCode = "id",dictTable = "sys_user",dicText = "realname")
 	private java.lang.String conmitId;
 	/**生效日期*/
-	@Excel(name = "*生效日期", width = 15,format = "yyyy-MM-dd")
+	@Excel(name = "生效日期", width = 15,format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "生效日期")
@@ -83,6 +95,7 @@ public class UserChage {
     @ApiModelProperty(value = "提交时间")
 	private java.util.Date conmitDate;
 	/**备注*/
+	@Excel(name = "备注", width = 15)
 	@ApiModelProperty(value = "备注")
 	private java.lang.String demo;
 	@Dict(dicCode = "state")

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userchange/mapper/UserChageMapper.java

@@ -2,7 +2,9 @@ package org.jeecg.modules.geke.userchange.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.geke.makeUpCard.entity.MakeUpCard;
 import org.jeecg.modules.geke.userchange.entity.UserChage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -17,4 +19,7 @@ public interface UserChageMapper extends BaseMapper<UserChage> {
     List<UserChage>listDate(@Param("startDate")String startDate);
     List<UserChage>listUserId(@Param("userid")String userid);
     boolean updateByUserids(@Param("userid")List<String>userid);
+
+    List<UserChage>lists(Page<UserChage> page,@Param("username")String username, @Param("type")String type, @Param("state")String state,@Param("startDate")String startDate,@Param("endDate")String endDate);
+
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userchange/mapper/xml/UserChageMapper.xml

@@ -23,4 +23,24 @@
             and user_id=#{userid}
         </if>
     </select>
+    <select id="lists" resultType="org.jeecg.modules.geke.userchange.entity.UserChage">
+        select a.*,b.work_no as 'workNo' from  geke_personnel_changes a
+        left join sys_user b  on a.user_id=b.id
+        where 1=1
+        <if test="username!=null and ''!=username">
+            and a.realname  LIKE concat(concat('%',#{username}),'%')
+        </if>
+        <if test="type!=null and ''!=type">
+            and a.type=#{type}
+        </if>
+        <if test="state!=null and ''!=state">
+            and a.state=#{state}
+        </if>
+        <if test="startDate!=null and ''!=startDate">
+            and date_format(a.time,'%Y-%m-%d')>= date_format(#{startDate},'%Y-%m-%d')
+        </if>
+        <if test="endDate!=null and ''!=endDate">
+            and date_format(a.time,'%Y-%m-%d')&lt;= date_format(#{endDate},'%Y-%m-%d')
+        </if>
+    </select>
 </mapper>

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userchange/service/IUserChageService.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.geke.userchange.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.geke.makeUpCard.entity.MakeUpCard;
 import org.jeecg.modules.geke.userchange.entity.UserChage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -16,4 +18,6 @@ public interface IUserChageService extends IService<UserChage> {
     List<UserChage> listDate(String startDate);
     List<UserChage>listUserId(String userid);
     boolean updateByUserids(List<String>userid);
+    Page<UserChage>lists(Page<UserChage> page, String username, String type, String state, String startDate, String endDate);
+
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userchange/service/impl/UserChageServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.geke.userchange.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.geke.userchange.entity.UserChage;
 import org.jeecg.modules.geke.userchange.mapper.UserChageMapper;
 import org.jeecg.modules.geke.userchange.service.IUserChageService;
@@ -35,4 +36,9 @@ public class UserChageServiceImpl extends ServiceImpl<UserChageMapper, UserChage
     public boolean updateByUserids(List<String> userid) {
         return userChageMapper.updateByUserids(userid);
     }
+
+    @Override
+    public Page<UserChage> lists(Page<UserChage> page, String username, String type, String state, String startDate, String endDate) {
+        return page.setRecords(userChageMapper.lists(page,username,type,state,startDate,endDate));
+    }
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userquit/controller/UserQuitController.java

@@ -219,6 +219,9 @@ public class UserQuitController extends JeecgController<UserQuit, IUserQuitServi
 		  OrderItem orderItem=new OrderItem();
 		  orderItem.setColumn(s[0]);
 		  orderItem.setAsc(true);
+		  if(s[0].equals("create_time")){
+			  orderItem.setColumn("a.apply_Time");
+		  }
 		  if (s[1].equals("DESC")){
 			  orderItem.setAsc(false);
 		  }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userquit/entity/UserQuit.java

@@ -65,11 +65,12 @@ public class UserQuit {
 	@Excel(name = "二级部门", width = 15)
 	private java.lang.String del2;
 	/**dept*/
-	@Excel(name = "部门", width = 15)
+
     @ApiModelProperty(value = "dept")
 	private java.lang.String dept;
 
-	@Excel(name = "职位", width = 20)
+	@Excel(name = "职位", width = 15,dictTable ="sys_position",dicText = "name",dicCode = "code")
+	@Dict(dictTable ="sys_position",dicText = "name",dicCode = "code")
 	private java.lang.String posts;
 
 	private java.lang.String post;

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

@@ -47,6 +47,7 @@ import org.jeecg.modules.geke.sysFile.entity.SysFile;
 import org.jeecg.modules.geke.sysFile.service.ISysFileService;
 import org.jeecg.modules.geke.userRule.service.IUserRuleService;
 import org.jeecg.modules.geke.userShift.entity.UserShift;
+import org.jeecg.modules.geke.userShift.entity.UserShiftExcel;
 import org.jeecg.modules.geke.userShift.entity.UserShiftVo;
 import org.jeecg.modules.geke.userShift.service.IUserShiftService;
 import org.jeecg.modules.geke.userchange.entity.UserChage;
@@ -325,6 +326,8 @@ public class SysUserController {
             orderItem.setAsc(true);
             if (s[1].equals("DESC")){
                 orderItem.setAsc(false);
+            }if (s[0].equals("create_time")){
+                orderItem.setColumn("work_no");
             }
             orderItems.add(orderItem);
         }
@@ -870,6 +873,8 @@ public class SysUserController {
             orderItem.setAsc(true);
             if (s[1].equals("DESC")){
                 orderItem.setAsc(false);
+            }if (s[0].equals("create_time")){
+                orderItem.setColumn("work_no");
             }
             orderItems.add(orderItem);
         }
@@ -1044,6 +1049,132 @@ public class SysUserController {
 
 
 
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param sysUser
+     */
+    @RequestMapping(value = "/exportXlsty")
+    public ModelAndView exportXlsty(HttpServletRequest request,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, UserShift userShift,String name,String dept,String deptid,String usertid,String type,String ruleid) throws ParseException {
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        Page<SysUser> page = new Page<SysUser>(1, 10000);
+        String deptids="";
+        String state="0";
+        List<String> mySubDepIdsByDepId=null;
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        List<SysUserRole> userRole = sysUserRoleService.list(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, sysUser.getId()));
+        if (userRole!=null&&userRole.size()>0){
+            for (SysUserRole role:userRole){
+                if (role.getRoleId().equals("1462659329857978370")){
+                    SysDepart one = sysDepartService.getOne(new QueryWrapper<SysDepart>().lambda().eq(SysDepart::getOrgCode, sysUser.getOrgCode()));
+                    if (one!=null&&!one.getOrgType().equals("0")){
+                        mySubDepIdsByDepId = sysDepartService.getMySubDepIdsByDepId(one.getId());
+                    }
+                }
+            }
+        }
+        Date shiftDate = userShift.getShiftDate();
+        if(oConvertUtils.isNotEmpty(name)){
+            name=name.trim();
+        }
+        String date="";
+        if (shiftDate!=null){
+            date=DateUtils.formatDate(userShift.getShiftDate());
+        }else {
+            date=DateUtils.formatDate(new Date());
+        }
+        IPage<Map<String, Object>> maps = userShiftService.mothUserShift(date,pageNo,pageSize,type,mySubDepIdsByDepId,name,dept);
+        //Step.2 AutoPoi 导出Excel
+        List<UserShiftExcel>pageList=new ArrayList<>();
+        if (maps.getRecords().size()>0){
+           maps.getRecords().forEach(str->{
+               UserShiftExcel us=new UserShiftExcel();
+               us.setWorkNo(str.get("workNo").toString());
+               us.setName(str.get("realname").toString());
+               us.setDepname(str.get("deptName").toString());
+               us.setMoth(DateUtils.formatDate(userShift.getShiftDate(),"yyyy-MM"));
+               if(oConvertUtils.isNotEmpty(str.get("a1"))){
+                   us.setA1(str.get("a1").toString());
+               } if(oConvertUtils.isNotEmpty(str.get("a2"))){
+                   us.setA2(str.get("a2").toString());
+               } if(oConvertUtils.isNotEmpty(str.get("a3"))){
+                   us.setA3(str.get("a3").toString());
+               } if(oConvertUtils.isNotEmpty(str.get("a4"))){
+                   us.setA4(str.get("a4").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a5"))){
+                   us.setA5(str.get("a5").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a6"))){
+                   us.setA6(str.get("a6").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a7"))){
+                   us.setA7(str.get("a7").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a8"))){
+                   us.setA8(str.get("a8").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a9"))){
+                   us.setA9(str.get("a9").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a10"))){
+                   us.setA10(str.get("a10").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a11"))){
+                   us.setA11(str.get("a11").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a12"))){
+                   us.setA12(str.get("a12").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a13"))){
+                   us.setA13(str.get("a13").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a14"))){
+                   us.setA14(str.get("a14").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a15"))){
+                   us.setA15(str.get("a15").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a16"))){
+                   us.setA16(str.get("a16").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a17"))){
+                   us.setA17(str.get("a17").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a18"))){
+                   us.setA18(str.get("a18").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a19"))){
+                   us.setA19(str.get("a19").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a20"))){
+                   us.setA20(str.get("a20").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a21"))){
+                   us.setA21(str.get("a21").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a22"))){
+                   us.setA22(str.get("a22").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a23"))){
+                   us.setA23(str.get("a23").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a24"))){
+                   us.setA24(str.get("a24").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a25"))){
+                   us.setA25(str.get("a25").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a26"))){
+                   us.setA26(str.get("a26").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a27"))){
+                   us.setA27(str.get("a27").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a28"))){
+                   us.setA28(str.get("a28").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a29"))){
+                   us.setA29(str.get("a29").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a30"))){
+                   us.setA30(str.get("a30").toString());
+               }if(oConvertUtils.isNotEmpty(str.get("a31"))){
+                   us.setA31(str.get("a31").toString());
+               }
+                pageList.add(us);
+            });
+        }
+
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "员工排班信息");
+        mv.addObject(NormalExcelConstants.CLASS, UserShiftExcel.class);
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String sName="员工排班信息";
+
+        ExportParams exportParams = new ExportParams("员工排班信息", "导出人:"+user.getRealname(), sName);
+        exportParams.setImageBasePath(upLoadPath);
+        mv.addObject(NormalExcelConstants.PARAMS, exportParams);
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
 
     /**
      * 通过excel导入数据

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

@@ -27,4 +27,6 @@ public interface SysPositionMapper extends BaseMapper<SysPosition> {
     //根据职位code编码查询员工
     List<SysUser>getUsers(@Param("code")String code);
 
+    String getCode(@Param("deptid")String deptid,@Param("name")String name);
+
 }

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

@@ -50,4 +50,13 @@
             </if>
 
     </select>
+    <select id="getCode" resultType="java.lang.String">
+        select code from sys_position where 1=1
+        <if test="deptid!=null and ''!=deptid">
+            and dept_id=#{deptid}
+        </if>
+<if test="name!=null and ''!=name">
+    and name=#{name}
+</if>
+    </select>
 </mapper>

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

@@ -22,5 +22,5 @@ public interface ISysPositionService extends IService<SysPosition> {
     SysPosition getOnes(String code);
     //根据编码查询用户
     List<SysUser>getUsers(String code);
-
+    String getCode(String deptid,String name);
 }

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

@@ -95,4 +95,9 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
     public List<SysUser> getUsers(String code) {
         return positionMapper.getUsers(code);
     }
+
+    @Override
+    public String getCode(String deptid, String name) {
+        return positionMapper.getCode(deptid,name);
+    }
 }

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

@@ -18,6 +18,8 @@ import org.jeecg.common.util.*;
 import org.jeecg.modules.geke.attendance.entity.Attendance;
 import org.jeecg.modules.geke.attendance.mapper.AttendanceMapper;
 import org.jeecg.modules.geke.attendance.service.IAttendanceService;
+import org.jeecg.modules.geke.attendanceRule.entity.AttendanceRule;
+import org.jeecg.modules.geke.attendanceRule.service.IAttendanceRuleService;
 import org.jeecg.modules.geke.makeUpCard.entity.MakeUpCard;
 import org.jeecg.modules.geke.makeUpCard.service.IMakeUpCardService;
 import org.jeecg.modules.geke.salary.entity.Salary;
@@ -119,6 +121,9 @@ public class WeixinUserImpl implements IWeixinUserService{
     @Autowired
     private AttendanceMapper attendanceMapper;
 
+    @Autowired
+    private IAttendanceRuleService  attendanceRuleService;
+
 
     private DepartmentService departmentService=new DepartmentService();
 
@@ -200,7 +205,9 @@ public class WeixinUserImpl implements IWeixinUserService{
                         }
                     }
                 }
-            }if (!sysUser.getRealname().equals("Mark.Zhang")&&!sysUser.getRealname().equals("用友U8")) {
+            }if (!sysUser.getRealname().equals("Mark.Zhang")&&!sysUser.getRealname().equals("用友U8")&&!ls.getMain_department().equals("34")&&!ls.getMain_department().equals("35")
+                    &&!ls.getMain_department().equals("36")&&!ls.getMain_department().equals("37")&&!ls.getMain_department().equals("38")&&!ls.getMain_department().equals("39")&&!ls.getMain_department().equals("40")
+                    &&!ls.getMain_department().equals("43")&&!ls.getMain_department().equals("45")&&!ls.getMain_department().equals("47")) {
                 sysUser.setDelFlag(Integer.parseInt(CommonConstant.DEL_FLAG_0.toString()));
                 sysUser.setStatus(1);
                 sysUser.setCreateTime(new Date());
@@ -219,6 +226,11 @@ public class WeixinUserImpl implements IWeixinUserService{
                         userIden = "2";
                         sysUserRole.setRoleId("1462659329857978370");
                     }
+                }if (oConvertUtils.isNotEmpty(ls.getPosition())){
+                    String code = sysPositionMapper.getCode(ls.getMain_department(), ls.getPosition());
+                    if (oConvertUtils.isNotEmpty(code)){
+                        sysUser.setPost(code);
+                    }
                 }
 
                 sysUser.setUserIdentity(Integer.parseInt(userIden));
@@ -249,8 +261,18 @@ public class WeixinUserImpl implements IWeixinUserService{
                 sysUser.setEmploymentStatus(10);
                 sysUser.setInfoSy(3);
                 sysUser.setSfzType("0");
-
+                sysUser.setIsAttendance("0");
                 Boolean add = sysUserService.add(sysUser, sysUserRole);
+                AttendanceRule at=new AttendanceRule();
+                at.setUserId(sysUser.getId());
+                at.setType("2");
+                at.setCreateTime(new Date());
+                at.setCreateBy("000");
+                AttendanceRule attendanceRule = attendanceRuleService.UserRule(sysUser.getId());
+                if (oConvertUtils.isEmpty(attendanceRule)){
+                    attendanceRuleService.save(at);
+                }
+
             }
         }catch (Exception e){
             e.printStackTrace();
@@ -437,12 +459,13 @@ public class WeixinUserImpl implements IWeixinUserService{
             }
             params.put("userid", ls.getId());
             params.put("name", ls.getRealname());
-           // params.put("alias", ls.getEgName());
+            params.put("alias", ls.getEgName());
             params.put("mobile", ls.getPhone());
             params.put("department", userDepart);
             params.put("position", postName);
             params.put("gender", ls.getSex());
             params.put("email", ls.getEmail());
+            params.put("biz_mail", ls.getEmail());
             params.put("telephone", ls.getTelephone());
             params.put("enable", ls.getStatus());
             params.put("is_leader_in_dept", idents);