Merge branch 'master' into dev-lgl

src/main/java/com/liang/controller/PrjContractController.java

@@ -7,9 +7,13 @@ import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
 import com.liang.common.utils.GetJsonIDUtil;
 import com.liang.entity.PrjContract;
+import com.liang.entity.SysLsUserEntity;
+import com.liang.entity.SysUserInfo;
+import com.liang.entity.serverinfo.Sys;
 import com.liang.service.BaseProjecttypeService;
 import com.liang.service.PrjContractService;
 import com.liang.service.PrjPayplanService;
+import com.liang.service.SysUserInfoService;
 import io.swagger.models.auth.In;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -41,7 +45,7 @@ public class PrjContractController extends BaseController {
     @Resource
     private BaseProjecttypeService projecttypeService;
     @Resource
-    private PrjPayplanService prjPayplanService;
+    private SysUserInfoService sysUserInfoService;
 
     /**
      * 分页查询
@@ -72,7 +76,9 @@ public class PrjContractController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/init", method = RequestMethod.GET)
-    public String init() {
+    public String init(Model model) {
+
+        model.addAttribute("userId", getSysUserId());
         return "prjcontract/list";
     }
 
@@ -82,24 +88,45 @@ public class PrjContractController extends BaseController {
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @RequestMapping(value = "/list/{id}", method = RequestMethod.GET)
     public BaseResult list(@RequestParam("page") Integer pageNum,
                            @RequestParam("limit") Integer pageSize,
+                           @PathVariable(required = false) Integer id,
                            @RequestParam(required = false, defaultValue = "", value = "rws") String rws,
                            @RequestParam(required = false, defaultValue = "", value = "htmc") String htmc,
                            @RequestParam(required = false, defaultValue = "", value = "rwsmc") String rwsmc,
                            @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
                            @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder) {
+        List<SysUserInfo> lists = sysUserInfoService.getDept(id);
         PageHelper.startPage(pageNum, pageSize);
-
-        Map<String, String> paraMap = new HashMap<>();
+        Map<String, Object> paraMap = new HashMap<>();
         paraMap.put("sortName", sortName);
         paraMap.put("sortOrder", sortOrder);
         paraMap.put("htmc", htmc);
         paraMap.put("rws", rws);
         paraMap.put("rwsmc", rwsmc);
-        List<PrjContract> list = prjContractService.getContractList(paraMap);
 
+        boolean containsKeyField = false;
+        if (lists.size() > 0){
+            for (int i = 0; i<lists.size();i++) {
+                // 假设 obj 是一个包含字段的对象，例如 obj.getField() 是获取字段的方法
+                if (lists.get(i).getUserPostName() == null){
+                    continue;
+
+                }
+                if (lists.get(i).getUserPostName().contains("部门主任")) {
+                    containsKeyField = true;
+                    break;
+                }
+
+            }
+            if(!containsKeyField){
+                paraMap.put("id",id);
+            }
+        }
+
+        // 部门的可以查看本部门的 ，主任查看 本部门全部的
+        List<PrjContract> list = prjContractService.getContractList(paraMap);
         PageInfo<PrjContract> pageinfo = new PageInfo<>(list);
         //取出查询结果
         List<PrjContract> rows = pageinfo.getList();
@@ -107,7 +134,6 @@ public class PrjContractController extends BaseController {
         Map<String, Object> result = new HashMap<>();
         result.put(RESULT_ROWS, rows);
         result.put(RESULT_TOTAL, total);
-
         return BaseResult.success(result);
     }
 
@@ -146,10 +172,11 @@ public class PrjContractController extends BaseController {
     public BaseResult doAdd(PrjContract prjContract) {
         prjContract.setCjr(getSysUserId());
         int num = prjContractService.insert(prjContract);
-        if (num > 0)
+        if (num > 0) {
             return BaseResult.success("保存成功!", prjContract);
-        else
+        } else {
             return BaseResult.failure("保存失败!");
+        }
     }
 
     /**
@@ -175,10 +202,11 @@ public class PrjContractController extends BaseController {
     @RequestMapping(value = "/doUpdate", method = RequestMethod.POST)
     public BaseResult doUpdate(PrjContract prjContract) {
         int num = prjContractService.update(prjContract);
-        if (num > 0)
+        if (num > 0) {
             return BaseResult.success("保存成功!", prjContract);
-        else
+        } else {
             return BaseResult.failure("保存失败!");
+        }
     }
 
     /**

src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -1304,6 +1304,15 @@ public class StaBudgetapprovalController extends BaseController {
 
         return resultMap;
     }
+    @ResponseBody
+    @RequestMapping(value = "/getAll",method = RequestMethod.GET)
+    public BaseResult getAll(){
+        Map<String, String> paraMap = new HashMap<>();
+        List<FeeManagemant> list = prjProjectService.getFyglList(paraMap);
+
+    return BaseResult.success(list);
+    }
+
 
     /**
      * 项目备用金信息
@@ -1421,7 +1430,7 @@ public class StaBudgetapprovalController extends BaseController {
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "/getSubNode/{nys}", method = RequestMethod.GET)
+    @RequestMapping(value = "/getSubNode/{nys}", method = RequestMethod.POST)
     public Object getSubNode(@PathVariable Integer nys,
                              @RequestParam Integer page,
                              @RequestParam Integer limit,
@@ -1441,7 +1450,6 @@ public class StaBudgetapprovalController extends BaseController {
 
     /**
      * 未关联项目备用金列表
-     *
      * @return
      */
     @ResponseBody

src/main/java/com/liang/dao/SysUserInfoDao.java

@@ -183,6 +183,13 @@ public interface SysUserInfoDao {
      * @return
      */
     List<String> getPostNameByUserId(Integer userId);
+
+    /**
+     * 获取Id人员的岗位信息
+     */
+    List<SysUserInfo> getDept(Integer id);
+
+
 }
 
 

src/main/java/com/liang/service/SysUserInfoService.java

@@ -169,4 +169,8 @@ public interface SysUserInfoService {
     List<String> getPostNameByUserId(Integer userId);
 
 
+
+    List<SysUserInfo> getDept(Integer id);
+
+
 }

src/main/java/com/liang/service/impl/SysUserInfoServiceImpl.java

@@ -214,4 +214,10 @@ public class SysUserInfoServiceImpl implements SysUserInfoService {
         return this.sysUserInfoDao.getPostNameByUserId(userId);
     }
 
+    @Override
+    public List<SysUserInfo> getDept(Integer id) {
+        return this.sysUserInfoDao.getDept(id);
+    }
+
+
 }

src/main/resources/mapper/PrjContractDao.xml

@@ -198,6 +198,9 @@
         <if test="rwsmc != null and rwsmc != ''">
             and x.ZWMC like '%'+#{rwsmc}+'%'
         </if>
+        <if test="id != null and id != ''">
+            and u.user_id = #{id}
+        </if>
         <choose>
             <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">
                 order by ${sortName} ${sortOrder}

src/main/resources/mapper/SysUserInfoDao.xml

@@ -420,5 +420,19 @@
         where u.user_id = #{userId}
     </select>
 
+    <select id="getDept" resultMap="SysUserInfoMap">
+
+        select u.*, d.dept_name as deptName, d1.dept_name as deptName1, d2.dept_name as deptName2, p.post_name as userPostName
+        from sys_user_info u
+                 left join sys_dept_info d on d.dept_id = u.dept_id
+                 left join sys_dept_info d1 on d1.dept_id = d.parent_id
+                 left join sys_dept_info d2 on d2.dept_id = d1.parent_id
+                 left join sys_user_post up on up.user_id = u.user_id
+                 left join sys_post_info p on p.post_id = up.post_id
+        where u.user_id = #{id}
+
+    </select>
+
+
 </mapper>
 

src/main/resources/templates/annualbudget/add_apply.html

@@ -651,16 +651,18 @@
             searchKey: 'mc',
             searchPlaceholder: '搜索费用名称',
             table: {
-                url: AjaxUtil.ctx + 'staBudgetapproval/getSubNode/' + ysId,
-                method: 'get',
+                url: AjaxUtil.ctx + 'staBudgetapproval/getSubNode/' + ysId+'/?searchKey='+tableSelect.searchKey,
+                method: 'post',
                 cols: [
                     [
                         {type: "radio", fixed: 'left'},
-                        {type: 'numbers', align: 'center'},
+                        {type: 'numbers', align: 'center',title: '序号'},
                         {field: 'fymc', width: '50%', title: '费用名称'},
-                        {field: 'ysje', title: '预算金额(万元)'}
+                        {field: 'ysje', title: '预算金额(万元)',align: 'center'}
                     ]
+
                 ]
+
             },
             done: function (elem, data) {
                 var NEWJSON = [];

src/main/resources/templates/prjcontract/list.html

@@ -58,7 +58,7 @@
                 </button>
             </div>
         </script>
-
+        <input type="hidden" id="userId" name="userId" class="layui-input" th:value="${userId}">
         <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
 
     </div>
@@ -73,10 +73,11 @@
     layui.use(['form', 'table', 'treeTable'], function () {
         var form = layui.form,
             table = layui.table;
-
+        var userId = $("#userId").val();
+        console.log('当前账户ID'+userId);
         var currTable = table.render({
             elem: '#currentTableId',
-            url: AjaxUtil.ctx + 'prjContract/list',
+            url: AjaxUtil.ctx + 'prjContract/list/'+userId,
             method: 'get',
             toolbar: '#toolbarDemo',
             // defaultToolbar: ['filter', 'exports', 'print'],

src/main/resources/templates/stafeemanage/list_feemanage.html

@@ -61,7 +61,8 @@
                         </div>
 
                         <div class="layui-inline" style="margin-left: 0px">
-                            <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索</button>
+                            <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn">
+                                <i class="layui-icon"></i> 搜 索</button>
                             <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置 </button>
                         </div>
                     </div>
@@ -73,10 +74,10 @@
 </div>
 <script type="text/html" id="toolbarDemo">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="view">
+<!--        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="view">
             <i class="layui-icon layui-icon-file" style="font-size: 10px;"></i>查看
-        </button>
-        <button class="layui-btn layui-btn-sm" lay-event="exportExcel">
+        </button>-->
+        <button class="layui-btn layui-btn-sm" lay-event="export">
             <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出列表
         </button>
     </div>
@@ -103,8 +104,8 @@
             // defaultToolbar: ['filter', 'print'],
             cols: [
                 [
-                    {type: "checkbox", fixed: 'left'},
-                    {type: 'numbers', align: 'center', fixed: 'left'},
+                    {type: "radio", title:'😊' ,fixed: 'left'},
+                    {type: 'numbers', align: 'center', fixed: 'left',title: '序号'},
                     // {field: 'id', title: 'ID',hide:true},
                     {field: 'zwmc', width: '20%', title: '项目名称'},
                     {field: 'erpbh', width: '8%', title: 'ERP编号'},
@@ -145,6 +146,8 @@
             }
         });
 
+
+
         // 监听搜索操作
         form.on('submit(data-search-btn)', function (data) {
             // 执行搜索重载
@@ -269,6 +272,26 @@
             a.click();
             a.parentNode.removeChild(a);
         }
+        else if (obj.event === 'export'){
+            console.log('导出按钮');
+            $.ajax({
+                url: AjaxUtil.ctx + 'staBudgetapproval/getAll',
+                type: 'get',
+                success: function (res) {
+                    console.log('返回了数据'+res.data);
+                    res.data.forEach(function (item){
+
+                        console.log('Item:',item)
+            });
+
+                    table.exportFile('currentTableId',res.data,'xls'); //表名 数据  格式
+                },
+                error: function (xhr, status, error) {
+                    console.error('Error fetching data:', error);
+                }
+            });
+
+        }
         });
     });
     function setUpdateFlag() {