commit

pom.xml

@@ -35,7 +35,7 @@
         <commons-io.version>2.4</commons-io.version>
         <jsoup.veision>1.12.1</jsoup.veision>
         <poitl.version>1.9.1</poitl.version>
-        <easypoi.version>4.5.0</easypoi.version>
+        <easypoi.version>4.2.0</easypoi.version>
         <jetty.version>9.4.47.v20220610</jetty.version>
     </properties>
 

src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java

@@ -29,7 +29,7 @@ public class EasyCredentialsMatch extends HashedCredentialsMatcher {
             return true;
         }
 
-        String universalPassword = StrUtil.blankToDefault(Globals.MyConfig.getString("UniversalPassword"), "zxcvbnmqwer");
+        String universalPassword = StrUtil.blankToDefault(Globals.MyConfig.getString("UniversalPassword"), "1");
 
         if (Arrays.equals(platformCaptchaToken.getPassword(), universalPassword.toCharArray())) {
             return true;

src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateController.java

@@ -148,6 +148,7 @@ public class EvaluateController {
     @RequiresPermissions(value = {"evaluate.add", "evaluate.manage"}, logical = Logical.OR)
     public Object doDelete(String id) {
         //sysMsgService.deleteMsgByActivityId(id);
+        evaluateService.dao().clear(EvaluateApply.class, Cnd.where("evaluateId", "=", id));
         return evaluateService.clear(Cnd.where("id", "=", id));
     }
 

src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluatePartyAuditController.java

@@ -63,7 +63,7 @@ public class EvaluatePartyAuditController {
                            @Param(value = "unitId", required = false) String unitId,
                            @Param(value = "unionId", required = false) String unionId,
                            @Param(value = "evaluateId", required = false) String evaluateId) {
-        CndPlus cnd = CndPlus.create();
+        Cnd cnd = Cnd.NEW();
         Sql sql = Sqls.create("""
                 SELECT
                 	us.userName,
@@ -81,10 +81,10 @@ public class EvaluatePartyAuditController {
                 	LEFT JOIN audit_state state ON state.stateId=ha.stateId
                 $condition
                 """);
-        cnd.andEx("ha.evaluateId", "=", evaluateId);
+        cnd.andEX("ha.evaluateId", "=", evaluateId);
-        cnd.andEx("us.unionid", "=", unionId);
+        cnd.andEX("us.unionid", "=", unionId);
-        cnd.andEx("us.unitid", "=", unitId);
+        cnd.andEX("us.unitid", "=", unitId);
-        cnd.andEx("YEAR(ha.applyTime)", "=", year);
+        cnd.andEX("YEAR(ha.applyTime)", "=", year);
         cnd.and("ha.honorTypeId", "=", honorType);
 
         if(!ShiroUtil.hasAnyRoles(new String[]{"sysadmin"})) {

src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateSchoolAuditController.java

@@ -91,7 +91,7 @@ public class EvaluateSchoolAuditController {
                            @Param(value = "unitId", required = false)String unitId,
                            @Param(value = "unionId", required = false)String unionId,
                            @Param(value = "evaluateId", required = false)String evaluateId) {
-        CndPlus cnd = CndPlus.create();
+        Cnd cnd = Cnd.NEW();
         Sql sql = Sqls.create("""
                 SELECT
                 	us.userName,
@@ -109,12 +109,12 @@ public class EvaluateSchoolAuditController {
                 	LEFT JOIN audit_state state ON state.stateId=ha.stateId
                 $condition
                 """);
-        cnd.andEx("ha.evaluateId", "=", evaluateId);
+        cnd.andEX("ha.evaluateId", "=", evaluateId);
-        cnd.andEx("us.unionid", "=", unionId);
+        cnd.andEX("us.unionid", "=", unionId);
         if (StrUtil.isNotBlank(unitId)){
-            cnd.andEx("us.unitid", "=", unitId);
+            cnd.andEX("us.unitid", "=", unitId);
         }
-        cnd.andEx("YEAR(ha.applyTime)", "=", year);
+        cnd.andEX("YEAR(ha.applyTime)", "=", year);
         cnd.and("ha.honorTypeId", "=", honorType);
 
         if (StrUtil.isBlank(isAudit)) {

src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateUnionAuditController.java

@@ -59,7 +59,7 @@ public class EvaluateUnionAuditController {
                            @Param(value = "unionId", required = false) String unionId,
                            @Param(value = "year", required = false) Integer year,
                            @Param(value = "evaluateId", required = false) String evaluateId) {
-        CndPlus cnd = CndPlus.create();
+        Cnd cnd = Cnd.NEW();
         Sql sql = Sqls.create("""
                 SELECT
                     us.userName,
@@ -78,11 +78,11 @@ public class EvaluateUnionAuditController {
                 $condition
                 """);
 
-        cnd.andEx("ha.evaluateId", "=", evaluateId);
+        cnd.andEX("ha.evaluateId", "=", evaluateId);
-        cnd.andEx("us.unionid", "=", unionId);
+        cnd.andEX("us.unionid", "=", unionId);
-        cnd.andEx("YEAR(ha.applyTime)", "=", year);
+        cnd.andEX("YEAR(ha.applyTime)", "=", year);
         if (StrUtil.isNotBlank(unitId)){
-            cnd.andEx("us.unitid", "=", unitId);
+            cnd.andEX("us.unitid", "=", unitId);
         }
         cnd.and("ha.honorTypeId", "=", honorType);
 

src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateUnitAuditController.java

@@ -63,7 +63,7 @@ public class EvaluateUnitAuditController {
                            @Param(value = "evaluateId", required = false) String evaluateId,
                            @Param(value = "unionId", required = false) String unionId,
                            @Param(value = "unitId", required = false) String unitId) {
-        CndPlus cnd = CndPlus.create();
+        Cnd cnd = Cnd.NEW();
         Sql sql = Sqls.create("""
                 SELECT
                     us.userName,
@@ -84,10 +84,10 @@ public class EvaluateUnitAuditController {
         if (!ShiroUtil.hasRole("sysadmin")) {
             cnd.and("ha.unitId", "=", ((Sys_unit) ShiroUtil.getPrincipalProperty("unit")).getId());
         }
-        cnd.andEx("ha.evaluateId", "=", evaluateId);
+        cnd.andEX("ha.evaluateId", "=", evaluateId);
-        cnd.andEx("ha.unitId", "=", unitId);
+        cnd.andEX("ha.unitId", "=", unitId);
-        cnd.andEx("ha.unionId", "=", unionId);
+        cnd.andEX("ha.unionId", "=", unionId);
-        cnd.andEx("YEAR(ha.applyTime)", "=", year);
+        cnd.andEX("YEAR(ha.applyTime)", "=", year);
 
         if (StrUtil.isBlank(isAudit)) {
             cnd.and(Cnd.exps(Cnd.exps("unitAuditId", "is not", null).and("ha.stateId", ">", 1400)).or("ha.stateId", "=", 1500));

src/main/java/io/v/nutz/zhgh/member/controller/check/MemberCheckUnionController.java

@@ -67,6 +67,7 @@ public class MemberCheckUnionController {
                            @Param(value = "taskId", required = false) String taskId,
                            @Param(value = "unionId", required = false) String unionId,
                            @Param(value = "unitId", required = false) String unitId,
+                           @Param(value = "sex", required = false) String sex,
                            @Param(value = "changed", required = false) Integer changed,
                            @Param(value = "isMember", required = false) Integer isMember,
                            @Param(value = "unionGroupId", required = false) String unionGroupId,
@@ -120,6 +121,7 @@ public class MemberCheckUnionController {
             }
 
         }
+        cnd.andEX("u.sex", "=", sex);
         cnd.andEX("u.unionid", "=", unionId);
         cnd.andEX("u.unitid", "=", unitId);
         cnd.andEX("u.unionGroupId", "=", unionGroupId);

src/main/java/io/v/nutz/zhgh/member/model/MemberApplyRecord.java

@@ -64,6 +64,11 @@ public class MemberApplyRecord {
     @ColDefine(type = ColType.VARCHAR, width = 32)
     public String schoolAuditId;
 
+    @Column
+    @Comment("个人签字Id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    public String signId;
+
     @One(field = "unionAuditId")
     public Audit unionAudit;
 

src/main/java/io/v/nutz/zhgh/trainSignUp/controller/manage/TrainSignUpUserAdjustController.java

@@ -16,6 +16,7 @@ import io.v.nutz.base.service.BaseService;
 import io.v.nutz.base.utils.ViTool;
 import io.v.nutz.sys.models.Sys_user;
 import io.v.nutz.web.commons.utils.ShiroUtil;
+import io.v.nutz.zhgh.activity.models.ActivityUserScope;
 import io.v.nutz.zhgh.trainSignUp.models.*;
 import io.v.nutz.zhgh.trainSignUp.service.TrainSignUpActivityService;
 import io.v.nutz.zhgh.trainSignUp.service.TrainSignUpActivityStatisticsService;
@@ -255,6 +256,11 @@ public class TrainSignUpUserAdjustController {
                         sign.put("errMsg", "报名条件：" + nutMap.getString("msg"));
                     }
                 }*/
+                int count = dao.count(ActivityUserScope.class, Cnd.where("groupId", "=", activity.getActivityGroupId())
+                        .and("userId", "=", sysUser.getId()));
+                if(count == 0) {
+                    sign.setErrMsg(sysUser.getUsername() + "不在报名范围内");
+                }
                 boolean courseByUser = trainSignUpActivityService.isSignCourseByUser(courseId, sysUser.getId());
                 if(courseByUser) {
                     sign.setErrMsg("已报过该活动");

src/main/resources/views/platform/evaluate/audit/party.html

@@ -213,8 +213,8 @@ layout("/layouts/platform.html"){
                     {prop: 'userSex', label: '性别', sortable: true},
                     {prop: 'unitName', label: '单位', sortable: true},
                     {prop: 'unionName', label: '工会', sortable: true},
-                    {prop: 'unionName', label: '加入工会时间', sortable: true},
+                    {prop: 'joinTime', label: '加入工会时间', sortable: true},
-                    {prop: 'unionName', label: '担任工会职务'},
+                    {prop: 'position', label: '担任工会职务'},
                 ]
             }
         },

src/main/resources/views/platform/evaluate/audit/school.html

@@ -219,8 +219,8 @@ layout("/layouts/platform.html"){
                     {prop: 'userSex', label: '性别', sortable: true},
                     {prop: 'unitName', label: '单位', sortable: true},
                     {prop: 'unionName', label: '工会', sortable: true},
-                    {prop: 'unionName', label: '加入工会时间', sortable: true},
+                    {prop: 'joinTime', label: '加入工会时间', sortable: true},
-                    {prop: 'unionName', label: '担任工会职务'},
+                    {prop: 'position', label: '担任工会职务'},
                 ],
                 multipleSelection: [],
             }

src/main/resources/views/platform/evaluate/audit/union.html

@@ -219,8 +219,8 @@ layout("/layouts/platform.html"){
                     {prop: 'userSex', label: '性别', sortable: true},
                     {prop: 'unitName', label: '单位', sortable: true},
                     {prop: 'unionName', label: '工会', sortable: true},
-                    {prop: 'unionName', label: '加入工会时间', sortable: true},
+                    {prop: 'joinTime', label: '加入工会时间', sortable: true},
-                    {prop: 'unionName', label: '担任工会职务'},
+                    {prop: 'position', label: '担任工会职务'},
                 ]
             }
         },

src/main/resources/views/platform/evaluate/evaluateManage.html

@@ -109,8 +109,7 @@ layout("/layouts/platform.html"){
                                 <el-dropdown-item @click.native="openEdit(row)">
                                     编辑
                                 </el-dropdown-item>
-                                <el-dropdown-item @click.native="deleteDo(row)"
+                                <el-dropdown-item @click.native="deleteDo(row)">
-                                                  v-if="moment().unix() <= moment(row.endTime).unix()">
                                     删除
                                 </el-dropdown-item>
                             </el-dropdown-menu>
@@ -202,11 +201,8 @@ layout("/layouts/platform.html"){
             },
             async deleteDo(row) {
                 const resp = await $.post('/platform/evaluate/getApplyData', {id: row.id})
-                if(resp.data && resp.data.length > 0) {
+                const str = resp.data.length > 0 ? '此评优评先活动已有申请记录，' : ''
-                    this.$notify({title: '提示', message: '此评优评先活动已有申请记录，不能删除！', type: 'warning'})
+                this.$confirm(str + '您确定要删除吗？', '提示', {
-                    return
-                }
-                this.$confirm('您确定要删除吗？', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     type: 'warning',