Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4
# Conflicts: # src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeMemberServiceImpl.java # src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html # src/main/resources/views/platform/zhgh/dayofficework/honor/manage/index.html # src/main/resources/views/platform/zhgh/dayofficework/honor/registration/index.html
This commit is contained in:
-1
@@ -98,7 +98,6 @@ public class CadreTrainingActController {
|
||||
}
|
||||
|
||||
@At
|
||||
@SaCheckPermission("cadreTraining.activity")
|
||||
@ApiOperation("查询单个活动信息")
|
||||
public Result get(@Param("id") String id) {
|
||||
CadreTrainingAct cadreTrainingAct = cadreTrainingActService.fetch(id);
|
||||
|
||||
-1
@@ -141,7 +141,6 @@ public class CadreTrainingCollectController {
|
||||
|
||||
@At
|
||||
@ApiOperation("获取活动列表")
|
||||
@SaCheckPermission(value = {"cadreTraining.collect", "h5.cadreTraining.collect"}, mode = SaMode.OR)
|
||||
public Result getActivityList(Integer year) {
|
||||
Cnd cnd = Cnd.NEW();
|
||||
// 添加年度筛选条件，基于报名开始时间
|
||||
|
||||
+1
@@ -112,6 +112,7 @@ public class CadreTrainingSchoolAuditController {
|
||||
}
|
||||
// 活动ID查询条件
|
||||
cnd.andEX("info.cadreTrainingActId", "=", activityId);
|
||||
cnd.andEX("year(info.applyTime)", "=", year);
|
||||
|
||||
// 工会、单位名称查询条件
|
||||
cnd.andEX("info.unionId", "=", unionId);
|
||||
|
||||
+1
-1
@@ -88,7 +88,7 @@ public class CadreTrainingSignUpController {
|
||||
Dict args = Dict.create();
|
||||
args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
|
||||
args.set(FlowConst.FORM_DATA, cadreTrainingSignUp);
|
||||
ProcessInstance instance = flowEngine.startProcessInstanceByKey("GBPX", cadreTrainingSignUp.getId(), SecurityUtil.getUserId(), args);
|
||||
ProcessInstance instance = flowEngine.startProcessInstanceByKey("GHGBPX", cadreTrainingSignUp.getId(), SecurityUtil.getUserId(), args);
|
||||
|
||||
// 自动完成第一个申请任务
|
||||
List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null);
|
||||
|
||||
+1
@@ -80,6 +80,7 @@ public class EvaluateMineController {
|
||||
Cnd cnd = Cnd.NEW();
|
||||
cnd.andEX("YEAR(info.year)", "=", year);
|
||||
cnd.and("info.loginName", "=", SecurityUtil.getUserLoginname());
|
||||
cnd.desc("info.createdAt");
|
||||
sql.setCondition(cnd);
|
||||
Pagination pagination = evaluateService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
|
||||
return Result.success(pagination);
|
||||
|
||||
+1
-1
@@ -112,7 +112,7 @@ public class ExerciseCardQueryController {
|
||||
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
|
||||
response.setCharacterEncoding("utf-8");
|
||||
String fileName = URLEncoder.encode("人员导入模版", "UTF-8").replaceAll("\\+", "%20");
|
||||
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
|
||||
response.setHeader("Content-disposition", "attachment;filename*=" + fileName + ".xlsx");
|
||||
EasyExcel.write(response.getOutputStream(), ExercisePeopleImportVo.class)
|
||||
.sheet("人员导入模版")
|
||||
.doWrite(ArrayList::new);
|
||||
|
||||
+3
-5
@@ -101,10 +101,8 @@ public class ExerciseCardServiceImpl extends BaseServiceImpl<ExerciseCard> imple
|
||||
errorInfos.add(v);
|
||||
continue;
|
||||
}
|
||||
//设置excel列的数据
|
||||
user.setUsername(v.getUsername());
|
||||
if (StrUtil.isNotBlank(v.getSex())) {
|
||||
user.setSex(v.getSex());
|
||||
if (StrUtil.isNotBlank(v.getUsername())) {
|
||||
user.setUsername(v.getUsername());
|
||||
}
|
||||
|
||||
insertOrUpdateUserList.add(user);
|
||||
@@ -117,7 +115,7 @@ public class ExerciseCardServiceImpl extends BaseServiceImpl<ExerciseCard> imple
|
||||
Record vwUser = vwUserMap.get(v.getLoginName());
|
||||
if (vwUser != null) {
|
||||
exerciseCard.setUserId(vwUser.getString("id"));
|
||||
exerciseCard.setUserId(vwUser.getString("userName"));
|
||||
exerciseCard.setUserName(vwUser.getString("username"));
|
||||
exerciseCard.setBirthday(DateUtil.parse(vwUser.getString("birthday"), "yyyy-MM-dd"));
|
||||
exerciseCard.setUnionId(vwUser.getString("unionId"));
|
||||
exerciseCard.setUnitId(vwUser.getString("unitId"));
|
||||
|
||||
+1
-1
@@ -61,7 +61,7 @@ public class HonorManageController {
|
||||
Sql sql = Sqls.create("""
|
||||
SELECT
|
||||
h.*,
|
||||
u.loginname,
|
||||
u.loginName,
|
||||
prize.`name` AS prizeName,
|
||||
type.`name` AS typeName,
|
||||
`level`.`name` AS levelName,
|
||||
|
||||
+1
-1
@@ -100,7 +100,7 @@ public class MeetingMineController {
|
||||
if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
|
||||
SqlExpressionGroup seg = new SqlExpressionGroup();
|
||||
seg.or("name", "like", "%" + pageForm.getSearchKeyword() + "%");
|
||||
seg.or("name", "like", "%" + pageForm.getSearchKeyword() + "%");
|
||||
seg.or("address", "like", "%" + pageForm.getSearchKeyword() + "%");
|
||||
cnd.and(seg);
|
||||
}
|
||||
if (StrUtil.isNotBlank(pageForm.getPageOrderName()) && StrUtil.isNotBlank(pageForm.getPageOrderBy())) {
|
||||
|
||||
+2
-1
@@ -39,11 +39,12 @@ public class QsvBankController {
|
||||
|
||||
@At
|
||||
@SaCheckPermission("qsv.bank")
|
||||
public Result pageData(PageForm pageForm) {
|
||||
public Result pageData(PageForm pageForm, String title) {
|
||||
Cnd cnd = Cnd.NEW();
|
||||
if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
|
||||
cnd.where().andLike(QsvBank::getTitle, pageForm.getSearchKeyword());
|
||||
}
|
||||
cnd.and(Cnd.likeEX("title", title));
|
||||
Pagination pagination = qsvBankService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), cnd);
|
||||
return Result.success(pagination);
|
||||
}
|
||||
|
||||
+1
@@ -10,6 +10,7 @@ import org.nutz.dao.Sqls;
|
||||
import org.nutz.dao.sql.Sql;
|
||||
import org.nutz.dao.util.cri.SqlExpressionGroup;
|
||||
import org.nutz.ioc.loader.annotation.IocBean;
|
||||
import org.nutz.lang.Strings;
|
||||
|
||||
/**
|
||||
* @author zhf
|
||||
|
||||
Reference in New Issue
Block a user