commit

src/main/java/io/v/nutz/lxy/controller/LxyFghShController.java

@@ -141,7 +141,7 @@ public class LxyFghShController {
 
     @At
     @ViReturn
-    @RequiresPermissions(value = {"zgfw.lxy.xghsh", "zgfw.lxy.fghsh"}, logical = Logical.OR)
+    @RequiresPermissions(value = {"zgfw.lxy.xghsh", "zgfw.lxy.fghsh", "zgfw.lxy.hdtj"}, logical = Logical.OR)
     public Object getBmInfo(String id) {
         Lxy_grxx grxx = lxyGrxxService.fetch(id);
         List<Sys_file> files = baseService.dao().query(Sys_file.class, Cnd.where("reid", "=", id));

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

@@ -11,6 +11,7 @@ import io.v.nutz.base.utils.Vi;
 import io.v.nutz.lxy.model.Lxy_bm;
 import io.v.nutz.lxy.service.LxyGrxxService;
 import io.v.nutz.lxy.service.LxyHdService;
+import io.v.nutz.util.ShiroUtil;
 import io.v.nutz.util.ViTool;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
@@ -75,15 +76,31 @@ public class LxyHdTjController {
                            @Param(value = "searchKey", required = false) String searchKey,
                            @Param("pageNumber") int pageNumber, @Param("pageSize") int pageSize) {
         Cnd cnd = Cnd.NEW();
-        Sql sql = Sqls.create("SELECT gr.* ,u.unionname,u.unioncode,u.unitname unitname,u.unitcode FROM `lxy_grxx` gr \n" +
+        Sql sql = Sqls.create("""
+                SELECT
+                	gr.*,
+                	u.unionname,
+                	u.unioncode,
+                	u.unitname unitname,
+                	u.unitcode
+                FROM
+                	`lxy_grxx` gr
+                	LEFT JOIN lxy_bm bm ON bm.userid = gr.userid
+                	LEFT JOIN `user` u ON u.id = bm.userid
+                $condition
+                """);
+        /*Sql sql = Sqls.create("SELECT gr.* ,u.unionname,u.unioncode,u.unitname unitname,u.unitcode FROM `lxy_grxx` gr \n" +
                 "LEFT JOIN lxy_bm bm ON bm.userid = gr.userid  \n" +
-                "LEFT JOIN `user` u ON u.id=bm.userid $condition");
+                "LEFT JOIN `user` u ON u.id=bm.userid $condition");*/
 
-        cnd.and(new Static("bm.bmzt = 5"));
+        cnd.and("bm.bmzt","=",5);
+//        cnd.and(new Static("bm.bmzt = 5"));
         cnd.and("gr.hdid", "=", hdid);
 
-        if (Strings.isNotBlank(ghid)) {
-            cnd.and("gr.ghid", "=", ghid);
+        if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) {
+            cnd.and("gr.ghid","=", Vi.getUnionId());
+        } else {
+            cnd.andEX("gr.ghid", "=", ghid);
         }
         if (Strings.isNotBlank(searchKey)) {
             cnd.where().andLike("u.loginname", searchKey).orLike("u.username", searchKey);
@@ -125,8 +142,10 @@ public class LxyHdTjController {
         cnd.and(new Static("bm.bmzt = 5"));
         cnd.and("gr.hdid", "=", hdid);
 
-        if (Strings.isNotBlank(ghid)) {
-            cnd.and("gr.ghid", "=", ghid);
+        if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) {
+            cnd.and("gr.ghid","=", Vi.getUnionId());
+        } else {
+            cnd.andEX("gr.ghid", "=", ghid);
         }
         cnd.groupBy("bm.userid");
         cnd.asc("bm.unionname").asc("bm.unitname").asc("gr.age");
@@ -145,12 +164,12 @@ public class LxyHdTjController {
         entities.add(new ExcelExportEntity("序号", "index", 10));
         entities.add(new ExcelExportEntity("工号", "loginname", 20));
         entities.add(new ExcelExportEntity("姓名", "username", 20));
+        entities.add(new ExcelExportEntity("性别", "sex", 20));
         entities.add(new ExcelExportEntity("年龄", "age", 20));
         entities.add(new ExcelExportEntity("手机号", "mobile", 20));
         entities.add(new ExcelExportEntity("身份证号", "idcard", 20));
         entities.add(new ExcelExportEntity("工会", "unionname", 20));
         entities.add(new ExcelExportEntity("单位", "unitname", 20));
-        entities.add(new ExcelExportEntity("单位", "unitname", 20));
         entities.add(new ExcelExportEntity("获奖名称", "zyhj", 20));
         entities.add(new ExcelExportEntity("备注", "bz", 20));
 

src/main/resources/static/components/plugins/CustomMessage.vue

@@ -0,0 +1,91 @@
+<template>
+  <el-dialog
+      :close-on-click-modal="false"
+      :visible.sync="sendMsgDialogVisible"
+      title="请在下方填写需要发送的内容"
+      width="50%"
+  >
+    <el-form :model="formData" label-width="80px" ref="sendForm">
+      <el-form-item
+          :rules="[{required: true, message: '请选择发送方式', trigger: ['blur', 'change']}]"
+          label="发送方式"
+          prop="sendTypes">
+        <el-checkbox-group size="medium" v-model="formData.sendTypes">
+          <el-checkbox border label="4">短信发送</el-checkbox>
+          <!--          <el-checkbox border label="4">微信发送</el-checkbox>-->
+        </el-checkbox-group>
+      </el-form-item>
+
+      <el-form-item
+          :rules="[{required: true, message: '请选择发送内容', trigger: ['blur', 'change']}]"
+          label="发送内容"
+          prop="content">
+        <el-input
+            :rows="6"
+            placeholder="请输入内容"
+            type="textarea"
+            v-model="formData.content">
+        </el-input>
+      </el-form-item>
+
+      <!--      <el-form-item></el-form-item>-->
+
+      <!--      <el-alert-->
+      <!--          :title="formData.url"-->
+      <!--          description="如果您发送的内容需要含有链接，请把上述内容复制到发送内容里面，不要随意修改！"-->
+      <!--          show-icon-->
+      <!--          type="warning">-->
+      <!--      </el-alert>-->
+
+    </el-form>
+    <span class="dialog-footer" slot="footer">
+    <el-button @click="sendMsgDialogVisible = false">取 消</el-button>
+    <el-button @click="sendMsgToNotWelfareUsers" type="primary">确 定</el-button>
+  </span>
+  </el-dialog>
+</template>
+
+<script>
+module.exports = {
+  name: "CustomMessage",
+  props: {},
+  data() {
+    return {
+      sendMsgDialogVisible: false,
+      formData: {
+        sendTypes: [],
+        content: null
+      }
+    }
+  },
+  methods: {
+    open() {
+      this.sendMsgDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.sendForm.resetFields()
+      })
+    },
+    close() {
+      this.sendMsgDialogVisible = false
+    },
+
+    sendMsgToNotWelfareUsers() {
+      this.$refs.sendForm.validate((valid) => {
+        if (valid) {
+          this.$emit('confirm', {
+            sendTypes: JSON.stringify(this.formData.sendTypes),
+            content: this.formData.content
+          })
+        }
+      })
+    }
+  },
+  created() {
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/main/resources/views/layouts/platform.html

@@ -139,6 +139,7 @@
         Vue.component('text-editor', httpVueLoader('/components/plugins/textEditor.vue'))
         Vue.component('border-table', httpVueLoader('/components/plugins/BorderTable.vue'))
         Vue.component('image-upload', httpVueLoader('/components/plugins/ImageUpload.vue'))
+        Vue.component('custom-message', httpVueLoader('/components/plugins/CustomMessage.vue'))
 
     </script>
 

src/main/resources/views/platform/wakeshome/declaration/apply.html

@@ -31,7 +31,7 @@ layout("/layouts/platform.html"){
                 </template>
 
                 <el-form :model="formData" :rules="formRules" label-width="150px" ref="form">
-                    <vi-title title="职工建家申报信息"></vi-title>
+                    <vi-title title="教工小家申报信息"></vi-title>
                     <el-row :gutter="20">
                         <el-col :span="8">
                             <el-form-item label="填报人" prop="username">
@@ -77,7 +77,7 @@ layout("/layouts/platform.html"){
                         </el-col>
                     </el-row>
 
-                    <el-form-item label="职工建家建设方案" prop="constructionPlan">
+                    <el-form-item label="教工小家建设方案" prop="constructionPlan">
                         <text-editor v-model="formData.constructionPlan"></text-editor>
                     </el-form-item>
                 </el-form>

src/main/resources/views/platform/wakeshome/info/apply.html

@@ -34,7 +34,7 @@ layout("/layouts/platform.html"){
 
                 <el-form :model="formData" :rules="formRules" label-width="100px" ref="AddForm">
                     <!--                    <el-divider content-position="left">职工之家申请信息</el-divider>-->
-                    <vi-title title="职工之家申请信息"></vi-title>
+                    <vi-title title="教工小家申请信息"></vi-title>
                     <el-row :gutter="20">
 
                         <el-col :lg="8" :sm="24">
@@ -74,7 +74,7 @@ layout("/layouts/platform.html"){
                     </el-row>
 
                     <!--                    <el-divider content-position="left">职工之家详细信息</el-divider>-->
-                    <vi-title title="职工之家详细信息"></vi-title>
+                    <vi-title title="教工小家详细信息"></vi-title>
                     <el-row :gutter="20">
                         <el-col :lg="8" :sm="24">
                             <el-form-item label="创办时间" prop="foundTime">
@@ -109,7 +109,7 @@ layout("/layouts/platform.html"){
                     </el-row>
 
                     <!--                    <el-divider content-position="left">职工之家荣誉信息</el-divider>-->
-                    <vi-title title="职工之家荣誉信息"></vi-title>
+                    <vi-title title="教工小家荣誉信息"></vi-title>
                     <el-row :gutter="20">
                         <el-col :lg="24" :sm="24">
                             <el-form-item class="is-required" label="获奖情况" prop="payStandard">
@@ -177,7 +177,7 @@ layout("/layouts/platform.html"){
                     </el-row>
 
                     <!--                    <el-divider content-position="left">职工之家材料上传</el-divider>-->
-                    <vi-title title="职工之家材料上传"></vi-title>
+                    <vi-title title="教工小家材料上传"></vi-title>
                     <el-row gutter="20">
                         <el-col :lg="24" :sm="24">
                             <el-form-item required label="图片上传" prop="picFiles">

src/main/resources/views/platform/zgfw/lxy/HdTj.html

@@ -355,7 +355,11 @@ display: -webkit-box;
         async created() {
             this.pageForm.year = new Date().getFullYear() + ""
             await this.getLxyHd()
-            this.ghList = await getUnions()
+            if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" == true){
+                this.ghList = await getUnionList()
+            } else {
+                this.ghList = await getUnionList("${@shiro.getPrincipalProperty('unit').getUnionid()}")
+            }
             this.pageData()
         }
     })