commit

src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java

@@ -8,6 +8,7 @@ import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.afterturn.easypoi.excel.export.ExcelExportService;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
@@ -106,6 +107,7 @@ public class WelfareListController {
                 			1 ELSE 0
                 			END AS isChoose,
                 		wl.id,
+                		wl.unionid,
                 		wl.username,
                 		wl.loginname,
                 		wl.personType,
@@ -115,8 +117,13 @@ public class WelfareListController {
                 		wl.listId,
                 		wus.userSign,
                 		wus.courierNumber,
-                		wus.receiveAddress,
+                		GROUP_CONCAT(
-                		GROUP_CONCAT( DISTINCT wuso.optionName, '（', wus.receiveAddress, '）' ) AS receiveAddress2,
+                          DISTINCT
+                          CONCAT(
+                              wuso.optionName,
+                              IF(wus.receiveAddress IS NOT NULL AND wus.receiveAddress != '', CONCAT('（', wus.receiveAddress, '）'), '')
+                          )
+                      ) AS receiveAddress,
                 		GROUP_CONCAT( DISTINCT wuso.optionName, '（', wus.selectNum, '份）' ) AS gist_list
                 	FROM
                 		view_welfare_list wl
@@ -161,11 +168,15 @@ public class WelfareListController {
         sql.setCondition(cnd);
         Pagination pagination = welfareListService.list(pageForm, sql);
         List<NutMap> mapList = pagination.getList();
-        if (provideMode != 3) {
+        List<WelfareMemberUnionConfirm> confirms = projectService.dao().query(WelfareMemberUnionConfirm.class, Cnd.where("projectId", "=", projectId));
+
         mapList.forEach(v -> {
-                v.put("receiveAddress",v.getString("receiveAddress2"));
+            if (StrUtil.isNotBlank(v.getString("unionid"))) {
-            });
+                WelfareMemberUnionConfirm confirm = confirms.stream().filter(o -> o.getUnionId().equals(v.getString("unionid"))).findFirst().orElse(null);
+                v.setv("isAudit", confirm != null ? confirm.getIsAudit() : "");
+                v.setv("auditTime", confirm != null ? confirm.getAuditTime() : "");
             }
+        });
         pagination.setList(mapList);
         return pagination;
     }
@@ -652,4 +663,23 @@ public class WelfareListController {
         }
 
     }
+
+
+    @At
+    @ViReturn
+    @RequiresPermissions("welfare.list.mange")
+    public Object doAuditUser(@Param(value = "projectId", required = false) String projectId,
+                              @Param(value = "unionId", required = false) String unionId,
+                              @Param(value = "flag") Boolean flag) {
+        if (flag) {
+            welfareListService.dao().update(WelfareMemberUnionConfirm.class, Chain.make("isAudit", true)
+                            .add("auditTime", DateUtil.date()).add("auditUser", ShiroUtil.getUserId()),
+                    Cnd.where("projectId", "=", projectId).and("unionId", "=", unionId));
+        } else {
+            welfareListService.dao().update(WelfareMemberUnionConfirm.class, Chain.make("isAudit", null)
+                            .add("auditTime", null).add("auditUser", null),
+                    Cnd.where("projectId", "=", projectId).and("unionId", "=", unionId));
+        }
+        return null;
+    }
 }

src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareProjectMangeController.java

@@ -9,15 +9,13 @@ import io.v.nutz.base.query.PageForm;
 import io.v.nutz.base.utils.MsgApi;
 import io.v.nutz.base.utils.Vi;
 import io.v.nutz.sys.models.Sys_home_activity;
+import io.v.nutz.sys.models.Sys_union;
 import io.v.nutz.sys.services.SysTaskService;
 import io.v.nutz.task.services.TaskPlatformService;
 import io.v.nutz.zhgh.data.model.MatchConditionStructure;
 import io.v.nutz.zhgh.data.service.MatchConditionStructureService;
 import io.v.nutz.zhgh.mobileHome.service.MobileHomeService;
-import io.v.nutz.zhgh.welfare.model.WelfareProject;
+import io.v.nutz.zhgh.welfare.model.*;
-import io.v.nutz.zhgh.welfare.model.WelfareProjectSubject;
-import io.v.nutz.zhgh.welfare.model.WelfareProjectSubjectOption;
-import io.v.nutz.zhgh.welfare.model.WelfareUserSelection;
 import io.v.nutz.zhgh.welfare.service.WelfareListService;
 import io.v.nutz.zhgh.welfare.service.WelfareProjectService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -39,6 +37,7 @@ import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
 import org.nutz.trans.Trans;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -237,6 +236,21 @@ public class WelfareProjectMangeController {
                 dao.update(project);
 
             }
+
+            dao.clear(WelfareMemberUnionConfirm.class, Cnd.where("projectId","=",project.getId()));
+            List<Sys_union> unionList = dao.query(Sys_union.class, Cnd.NEW());
+            List<WelfareMemberUnionConfirm> confirmList = new ArrayList<>();
+            for (Sys_union union : unionList) {
+                WelfareMemberUnionConfirm confirm = new WelfareMemberUnionConfirm();
+                confirm.setId(R.UU32());
+                confirm.setProjectId(project.getId());
+                confirm.setUnionId(union.getId());
+                confirm.setIsAudit(false);
+                confirmList.add(confirm);
+            }
+            dao.fastInsert(confirmList);
+
+
             Sys_home_activity sysHomeActivity = project.covertToSysHomeActivity();
             sysHomeActivity.setEnable(true);
             dao.insertOrUpdate(sysHomeActivity);

src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareUserChooseController.java

@@ -128,6 +128,12 @@ public class WelfareUserChooseController {
     @RequiresPermissions("welfare.user.choose")
     public Result confirmSelect(@Param("welfareUserSelections") WelfareUserSelection[] welfareUserSelections,
                                 String projectId) {
+
+        int count = simpleService.dao().count(WelfareList.class, Cnd.where("projectId", "=", projectId).and("userId", "=", ShiroUtil.getUserId()));
+        if (count == 0) {
+            return Result.error("您暂无权限！");
+        }
+
         //删除上次选择的
         simpleService.dao().clear(WelfareUserSelection.class,
                 Cnd.where("welfareId", "=", projectId)

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

@@ -0,0 +1,49 @@
+package io.v.nutz.zhgh.welfare.model;
+
+
+import io.v.nutz.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+import java.util.Date;
+
+
+@Data
+@Table
+@EqualsAndHashCode(callSuper = true)
+public class WelfareMemberUnionConfirm extends BaseModel {
+
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("所属项目")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String projectId;
+
+    @Column
+    @Comment("工会id")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String unionId;
+
+    @Column
+    @Comment("是否确认")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean isAudit;
+
+    @Column
+    @Comment("确认时间")
+    @ColDefine(type = ColType.DATETIME)
+    private Date auditTime;
+
+    @Column
+    @Comment("操作人")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String auditUser;
+}

src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java

@@ -203,11 +203,14 @@ public class WelfareSingleServiceImpl extends ViServiceImpl<WelfareProject> impl
         boolean isThreeUnit = Globals.MyConfig.getBoolean("isThreeUnit");
         Sql welfareUnitSql = Sqls.create("""
                 SELECT
-                  	unit.*
+                  	unit.*,
+                  	wmuc.isAudit
                 FROM
                   	welfare_unit unit
+                  	LEFT JOIN welfare_member_union_confirm wmuc ON wmuc.projectId = @projectId
+                	AND wmuc.unionId = unit.welfareUnitId
                 $condition
-                """);
+                """).setParam("projectId", projectId);
         CndPlus cnd = CndPlus.create();
 
         if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin,SchoolUnionWelfareAdmin")) {

src/main/resources/views/mobile/welfare/list/receive.html

@@ -486,8 +486,8 @@ layout("/mobile/platform.html"){
         },
         methods: {
             addShopping(address) {
-                this.$set(this.projectInfo.welfareProjectSubjects[0].options[this.optionIndex], "receiveAddress", address)
+                this.$set(this.selectedOptions[this.optionIndex], "receiveAddress", address)
-                this.projectInfo.welfareProjectSubjects[0].options[this.optionIndex].receiveAddress = address
+                this.selectedOptions[this.optionIndex].receiveAddress = address
                 this.shoppingPopup = false
             },
             async onSearchShoppingAddress() {

src/main/resources/views/platform/welfare/include/common.js

@@ -106,7 +106,7 @@ let commonColumns = [
     {prop: 'loginname', label: '工号', width: "100"},
     {prop: 'username', label: '姓名', width: "80"},
     {prop: 'sex', label: '性别', sortable: true, width: '100px', checked: 0},
-    {prop: 'personType', label: '人员类型', sortable: true, width: "100"},
+    // {prop: 'personType', label: '人员类型', sortable: true, width: "100"},
     {prop: 'userState', label: '在职状态', sortable: true, width: "100"},
     {prop: 'unionname', label: '所属工会', sortable: true},
     {prop: 'unitname', label: '所属单位', sortable: true},

src/main/resources/views/platform/welfare/list/ListMange.html

@@ -271,7 +271,13 @@ layout("/layouts/platform.html"){
                             一键全部领取
                         </el-button>
 
-
+                        <el-button :disabled="moment(projectInfo.choiceTimeEnd).valueOf()<moment().valueOf()" type="primary" size="small"
+                                   @click="doAudit(true)">确认名单
+                        </el-button>
+                        <!-- 取消确认 -->
+                        <el-button :disabled="moment(projectInfo.choiceTimeEnd).valueOf()<moment().valueOf()" type="danger" size="small"
+                                   @click="doAudit(false)">取消确认
+                        </el-button>
                         <!--   <el-button :disabled="!pageForm.projectId" type="primary" size="small"
                                            icon="el-icon-download"
                                            @click="openExportWelFareList(pageForm.projectId)">导出签字表
@@ -280,12 +286,12 @@ layout("/layouts/platform.html"){
                                      icon="el-icon-download"
                                      @click="doExportWelfare(pageForm.projectId)">导出名单
                           </el-button>-->
-                        <el-button :disabled="!pageForm.projectId" @click="openAdd"
+                        <!--  <el-button :disabled="!pageForm.projectId" @click="openAdd"
                                      icon="el-icon-plus"
                                      size="small"
                                      type="primary"
                                      v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('H05')}">添加
-                        </el-button>
+                          </el-button>-->
                     </template>
                 </table-tool>
 
@@ -329,21 +335,9 @@ layout("/layouts/platform.html"){
                                       style="height: 60px" v-if="row.userSign"></el-image>
                             <el-tag type="warning" v-else>暂无</el-tag>
                         </template>
-                        <template scope="{row}" v-else-if="column.prop=='realWelfareUnitId'">
+                        <template v-else-if="column.prop=='isAudit'" scope="{row}">
-                            <span v-if="!row.editWelfareUnit">{{row.realWelfareUnitName}}</span>
+                            <el-tag type="success" v-if="row.isAudit">已确认</el-tag>
-                            <div v-else>
+                            <el-tag type="info" v-else>未确认</el-tag>
-                                <el-select clearable filterable
-                                           placeholder="请选择" size="small"
-                                           style="width: 160px"
-                                           v-model="row.modifiedWelfareUnitId">
-                                    <el-option
-                                            :key="item.welfareUnitId"
-                                            :label="item.welfareUnitName"
-                                            :value="item.welfareUnitId"
-                                            v-for="item in welfareUnits">
-                                    </el-option>
-                                </el-select>
-                            </div>
                         </template>
                     </el-table-column>
                     <el-table-column label="快递单号" prop="courierNumber" show-overflow-tooltip
@@ -364,7 +358,7 @@ layout("/layouts/platform.html"){
                             <!--                                领取-->
                             <!--                            </el-button>-->
                             <el-button @click="openEditWelfare(row)" size="mini" type="primary"
-                                       v-if="pageFormSignMode!==1">
+                                       :disabled="moment(projectInfo.choiceTimeEnd).valueOf()<moment().valueOf()">
                                 编辑
                             </el-button>
                             <el-button @click="doDelete(row)" size="mini" type="danger"
@@ -637,7 +631,9 @@ layout("/layouts/platform.html"){
                     {prop: 'isChoose', label: '是否选择', width: "100px", sortable: true},
                     {prop: 'gist_list', label: '所选福利', width: "100px"},
                     {prop: 'receiveAddress', label: '地址', width: "100px"},
-                    {prop: 'userSign', label: '签字', width: "100px"},
+                    {prop: 'userSign', label: '签字', width: "100px", checked: 0},
+                    {prop: 'isAudit', label: '是否确认'},
+                    {prop: 'auditTime', label: '确认时间', checked: 0},
                 ]),
                 formRules: {},
                 welfare,
@@ -675,6 +671,35 @@ layout("/layouts/platform.html"){
             'courier-number-info': httpVueLoader('/components/welfare/CourierNumberInfo.vue?v=' + new Date().getTime())
         },
         methods: {
+            async doAudit(flag) {
+                // flag true,确认 false,取消
+                if ("${@shiro.hasRole('sysadmin')}" === "true" && !this.pageForm.welfareUnit) {
+                    this.notifyWarning("请选择需要提交的分工会")
+                    return
+                }
+                if (this.pageForm.totalCount === 0) {
+                    this.notifyWarning("当前分工会没有名单，暂不需要提交")
+                    return
+                }
+                const confirm = await this.$confirm('您确定名单都已核实，准确无误?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                })
+                if (confirm === "confirm") {
+                    const resp = await $.post("/platform/welfare/list/mange/doAuditUser", {
+                        projectId: this.pageForm.projectId,
+                        unionId: this.pageForm.welfareUnit,
+                        flag: flag
+                    })
+                    if (resp.code === 0) {
+                        this.notifySuccess(resp.msg)
+                        this.doSearch()
+                    } else {
+                        this.notifyError(resp.msg)
+                    }
+                }
+            },
             doExcelByOptionId() {
                 if (!this.pageForm.optionId) {
                     this.$message.warning('请选择要导出的套餐')
@@ -1117,6 +1142,7 @@ layout("/layouts/platform.html"){
                     }
                 })
                 this.welfareOptions = resp.data
+                this.projectInfo = this.projectSelectOptions.find(v => v.value === this.pageForm.projectId)?.v
             },
             async changeWelfareUnit() {
                 this.$set(this.pageForm, 'unit', '')

src/main/resources/views/platform/welfare/statistics/single.html

@@ -212,6 +212,10 @@ layout("/layouts/platform.html"){
                         v-for="column in tableColumns"
                     >
                         <template scope="{row}" v-if="column.prop=='welfareUnitName'">{{row.welfareUnitName}}</template>
+                        <template scope="{row}" v-else-if="column.prop=='isAudit'">
+                            <span v-if="row.isAudit"><el-tag>已提交</el-tag></span>
+                            <span v-else><el-tag type="danger">未提交</el-tag></span>
+                        </template>
                         <template scope="{row}" v-else-if="column.prop=='unselectedTeacherSum'">
                             <el-link @click="openUnclaimed(row.welfareUnitCode)" type="primary">{{row.unselectedTeacherSum}}</el-link>
                         </template>
@@ -589,6 +593,7 @@ layout("/layouts/platform.html"){
                             label: welfare.welfareUnitModeName
                         }
                     ].concat(resp.data.tableColumn)
+                    this.tableColumns.push({prop: "isAudit", label: "是否核对"})
                     this.tableData = resp.data.tableList
                 }
                 loading.close()

src/main/resources/views/platform/welfare/userChoose.html

@@ -130,7 +130,9 @@ layout("/layouts/platform.html"){
 
                     <el-table-column align="center" header-align="center" label="操作" prop="userOnline" width="150px">
                         <template scope="{row}">
-                            <el-button type="primary" size="mini" @click="openChoose(row)">{{confirmButtonInfo(row).text}}</el-button>
+                            <el-button type="primary" size="mini" @click="openChoose(row)">
+                                {{confirmButtonInfo(row).text}}
+                            </el-button>
 
                             <!--                            <el-button @click="openChoose(row)" size="mini" type="primary"-->
                             <!--                                       v-if="new Date().getTime()>moment(row.choiceTimeStart).valueOf()-->
@@ -165,7 +167,8 @@ layout("/layouts/platform.html"){
                             <el-form-item label="福利礼品">{{projectInfo.gift}}</el-form-item>
                         </el-col>
                         <el-col span="8">
-                            <el-form-item label="选择形式">{{projectInfo.isCheckBox==='checkBox'?'多选':'单选'}}</el-form-item>
+                            <el-form-item label="选择形式">{{projectInfo.isCheckBox==='checkBox'?'多选':'单选'}}
+                            </el-form-item>
                         </el-col>
                         <el-col span="8" v-if="projectInfo.isCheckBox==='checkBox'">
                             <el-form-item label="最多选几个">{{projectInfo.multiSelectNum}}个</el-form-item>
@@ -187,7 +190,9 @@ layout("/layouts/platform.html"){
                             </el-form-item>
                         </el-col>
                         <el-col span="8">
-                            <el-form-item label="选择时间">{{projectInfo.choiceTimeStart}}至{{projectInfo.choiceTimeEnd}}</el-form-item>
+                            <el-form-item label="选择时间">
+                                {{projectInfo.choiceTimeStart}}至{{projectInfo.choiceTimeEnd}}
+                            </el-form-item>
                         </el-col>
                     </el-row>
 
@@ -199,7 +204,8 @@ layout("/layouts/platform.html"){
                                         <div slot="header" style="display: flex; justify-content: space-between">
                                             <div style="color: #000; font-size: 18px">{{option.optionName}}</div>
                                             <div>
-                                                <el-button @click.stop="viewDesc(option)" type="text">套餐详情</el-button>
+                                                <el-button @click.stop="viewDesc(option)" type="text">套餐详情
+                                                </el-button>
                                             </div>
                                         </div>
 
@@ -349,7 +355,8 @@ layout("/layouts/platform.html"){
     </el-drawer>
 
     <el-dialog :close-on-click-modal="false" :visible.sync="addressDialogVisible" title="收货地址" width="40%">
-        <el-form :model="formData" label-position="right" :rules="formRules" label-suffix="：" label-width="120px" ref="addForm">
+        <el-form :model="formData" label-position="right" :rules="formRules" label-suffix="：" label-width="120px"
+                 ref="addForm">
             <el-row :gutter="60">
                 <el-col :span="24">
                     <el-form-item label="地址信息" prop="addressList">
@@ -383,7 +390,8 @@ layout("/layouts/platform.html"){
                 </el-col>
                 <el-col :span="24">
                     <el-form-item label="手机号码" prop="tel">
-                        <el-input maxlength="11" placeholder="请填写手机号码" clearable v-model="formData.tel"></el-input>
+                        <el-input maxlength="11" placeholder="请填写手机号码" clearable
+                                  v-model="formData.tel"></el-input>
                     </el-form-item>
                 </el-col>
 
@@ -627,10 +635,15 @@ layout("/layouts/platform.html"){
                         }
 
                         // 判断门店是否选择
+                        console.log(this.projectInfo.welfareProjectSubjects[0])
                         const chooseOptions = this.projectInfo.welfareProjectSubjects[0].options
-                            .filter((v) => v.selectNum > 0)
+                            .filter((v) => v.selectNum > 0 && v.shoppingId)
                             .map((item) => {
-                                return { optionName: item.optionName, selectNum: item.selectNum, receiveAddress: item.receiveAddress }
+                                return {
+                                    optionName: item.optionName,
+                                    selectNum: item.selectNum,
+                                    receiveAddress: item.receiveAddress
+                                }
                             })
                         let isReceiveAddress = true
                         for (const item of chooseOptions) {
@@ -761,7 +774,7 @@ layout("/layouts/platform.html"){
             async getShoppingType() {
                 const {data} = await $.get("/platform/shoppingType/apply/getShoppingType")
                 this.projectInfo.welfareProjectSubjects[0].options.forEach((item) => {
-                    item.receiveAddressList = data.find((v) => v.id === item.shoppingId).offlineStores
+                    item.receiveAddressList = data.find((v) => v.id === item.shoppingId)?.offlineStores
                 })
 
                 console.log(this.projectInfo.welfareProjectSubjects[0])