server_commit

src/main/java/io/v/nutz/base/utils/PwdUtil.java

@@ -126,14 +126,14 @@ public class PwdUtil {
 //        System.out.println(dbPwd);
 //        System.out.println(s);
 
-        String pwd = "004512";
+        String pwd = "002432";
         String dbPwd = PwdUtil.doSm4CbcEncrypt(pwd);
         System.out.println(dbPwd);
 
         // 7fdc9e096de7e2c18e4ed4efa16f50f8
 
-        // e43646c461a8ee364c569552225e28be
-//        String ddPwd = PwdUtil.doSm4CbcDecrypt("d3b42e17dba55dbe9bfa471c8ff191d9");
+        // e43646c461a8ee364c569552225e28be 3d6edd620d5b9d73190390a917c9d724
+//        String ddPwd = PwdUtil.doSm4CbcDecrypt("fca022ce2d08510730f56dfa44ca90b73bf9f5d7c18a53e24bd72fe746ee3da8");
 //        System.out.println(ddPwd);
     }
 }

src/main/java/io/v/nutz/sys/controllers/platform/sys/SysUserController.java

@@ -3,6 +3,7 @@ package io.v.nutz.sys.controllers.platform.sys;
 import cn.wizzer.framework.base.Result;
 import io.v.nutz.base.annontation.ViReturn;
 import io.v.nutz.base.utils.PageUtil;
+import io.v.nutz.base.utils.PwdUtil;
 import io.v.nutz.base.utils.Roles;
 import io.v.nutz.base.utils.StringUtil;
 import io.v.nutz.sys.models.Sys_menu;
@@ -149,12 +150,15 @@ public class SysUserController {
             Sys_user user = sysUserService.fetch(id);
             String salt = R.UU32();
 //            String pwd = R.captchaNumber(6);
-            String pwd = "dd3s@#2022";
-            String hashedPasswordBase64 = new Sha256Hash(pwd, ByteSource.Util.bytes(salt), 1024).toHex();
-            sysUserService.update(Chain.make("salt", salt).add("password", hashedPasswordBase64), Cnd.where("id", "=", id));
+
+            String dbPwd = PwdUtil.doSm4CbcEncrypt(user.getLoginname());
+
+//            String pwd = "dd3s@#2022";
+//            String hashedPasswordBase64 = new Sha256Hash(pwd, ByteSource.Util.bytes(salt), 1024).toHex();
+            sysUserService.update(Chain.make("salt", salt).add("password", dbPwd), Cnd.where("id", "=", id));
             sysUserService.clearCache();
             req.setAttribute("loginname", user.getLoginname());
-            return Result.success().addData(pwd);
+            return Result.success().addData(dbPwd);
         } catch (Exception e) {
             return Result.error();
         }

src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java

@@ -1,5 +1,6 @@
 package io.v.nutz.zhgh.activity.controller.school;
 
+import cn.hutool.core.util.StrUtil;
 import cn.wizzer.framework.base.Result;
 import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.config.Configure;
@@ -425,8 +426,15 @@ public class ActivityApplyController {
             apply.setActivityUnionName(basicUnion.getUnionname());
             apply.setApplyUnitId(basicUnit.getId());
 
-            dao.update(Sys_user.class, Chain.make("mobile", apply.getMobile()).add("position", apply.getPosition()),
-                    Cnd.where("id", "=", apply.getUserId()));
+            Chain chain = Chain.make("diseaseType", null);
+            if (StrUtil.isNotBlank(apply.getMobile())) {
+                chain.add("mobile", apply.getMobile());
+            }
+            if (StrUtil.isNotBlank(apply.getPosition())) {
+//                chain.add("position", apply.getPosition());
+            }
+
+            dao.update(Sys_user.class, chain, Cnd.where("id", "=", apply.getUserId()));
         }
         activitySchoolApplyService.doApplies(activityId, basicUnit.getUnionid(), eventId, Arrays.asList(applies));
         return null;

src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java

@@ -277,6 +277,7 @@ public class ActivityCommonController {
 
 
     @At
+    @Ok("void")
     public void exportXlsx(String id, String unionId,Boolean isUnion, HttpServletResponse response) throws IOException {
         Sql sql = Sqls.create("""
                 SELECT
@@ -293,7 +294,9 @@ public class ActivityCommonController {
                  	u2.username applyUserName,
                     ev.allName,
                     sc.`name` activityName,
-                    app.`team` team
+                    app.`team` team,
+                    app.num,
+                    app.positioning
                 FROM
                 	`activity_school_apply` app
                  	LEFT JOIN `user` u ON u.id = app.userId
@@ -306,6 +309,7 @@ public class ActivityCommonController {
                 	$cnd
                 ORDER BY
                     u.unioncode ASC,
+                    app.num ASC,
                     app.applyUser DESC,
                     ev.allName DESC,
                  	app.`team` asc
@@ -335,6 +339,8 @@ public class ActivityCommonController {
         exportEntities.add(new ExcelExportEntity("性别", "sex", 20));
         exportEntities.add(new ExcelExportEntity("手机号码", "mobile", 20));
         exportEntities.add(new ExcelExportEntity("职称职务", "position", 20));
+        exportEntities.add(new ExcelExportEntity("队员号码", "num", 20));
+        exportEntities.add(new ExcelExportEntity("位置", "positioning", 20));
         exportEntities.add(new ExcelExportEntity("所在单位", "unitname", 20));
 //        exportEntities.add(new ExcelExportEntity("身份", "sf", 20));
         exportEntities.add(new ExcelExportEntity("报名人", "applyUserName", 20));

src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityInfoManageController.java

@@ -99,7 +99,7 @@ public class ActivityInfoManageController {
                     school.foundDate,
                     school.applyType,
                     school.isDisabled,
-                	(SELECT COUNT(1) FROM activity_school_apply asa WHERE asa.activityId = school.id) applyNum
+                	(SELECT COUNT(1) FROM activity_school_apply asa WHERE asa.activityId = school.id and asa.status=2) applyNum
                 FROM
                     activity_school school 
                     LEFT JOIN activity_basic_settings ba ON ba.`code` = school.activityLevel

src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java

@@ -201,6 +201,18 @@ public class ActivitySchoolApply implements Serializable {
     @ColDefine(type = ColType.VARCHAR, width = 50)
     private String position;
 
+    @Column
+    @Comment("号码")
+    @Excel(name = "号码", width = 20)
+    @ColDefine(type = ColType.INT, width = 10)
+    private Integer num;
+
+    @Column
+    @Comment("位置")
+    @Excel(name = "位置", width = 20)
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String positioning;
+
     @Excel(name = "在职状态", width = 20)
     private String userState;
 

src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java

@@ -288,7 +288,7 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> implements
         BeanUtils.copyProperties(user, history);
         history.setChangeTime(new Date());
         history.setChangeTypes(changeTypes.stream().map(UserChangeType::getCode).collect(Collectors.toList()));
-        history.setChangeOperator(StrUtil.blankToDefault((String) ShiroUtil.getPrincipalProperty("username"), "系统"));
+        history.setChangeOperator("系统更新");
         history.setChangeOrigin(MemberChangeOrigin.SYSTEM.getCode());
         history.setChangeReason("数据自动更新");
 

src/main/java/io/v/nutz/zhgh/lxy/controller/LxyHdTjController.java

@@ -127,7 +127,8 @@ public class LxyHdTjController {
                 	bm.zyhj,
                 	bm.idcard,
                 	bm.mobile,
-                	bm.talent
+                	bm.talent,
+                	bm.point
                 FROM
                 	`lxy_grxx` gr
                 	LEFT JOIN lxy_bm bm ON bm.userid = gr.userid

src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java

@@ -85,6 +85,12 @@ public class WelfareProject extends BaseModel implements Serializable, SysHomeCo
     @ColDefine(type = ColType.DATETIME)
     private Date overdueChoiceTimeEnd;
 
+
+    @Column
+    @Comment("核对截至时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date checkEndTime;
+
     @Column
     @Comment("发放地址")
     @ColDefine(type = ColType.VARCHAR, width = 200)