项目转移

src/main/java/com/liang/common/utils/ResponseData.java

@@ -0,0 +1,33 @@
+package com.liang.common.utils;
+
+import lombok.Data;
+
+/**
+ * @Author ly 定义返回类型
+ * @Date 2024/11/3 21:10
+ * @Version 1.0
+ */
+@Data
+public class ResponseData {  
+
+    private int code;
+    private String message;
+    private Object data;
+
+    // 构造方法、getter和setter等
+
+    public static ResponseData success(String message) {
+        ResponseData responseData = new ResponseData();
+        responseData.setCode(0);
+        responseData.setMessage(message);
+        return responseData;
+    }
+
+    public static ResponseData failure(int code, String message) {
+        ResponseData responseData = new ResponseData();
+        responseData.setCode(code);
+        responseData.setMessage(message);
+        return responseData;
+    }
+
+}

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

@@ -45,6 +45,11 @@ public class PrjContractController extends BaseController {
     private PrjApproverecordService prjApproverecordService;
     @Resource
     private StaPayapprovalService staPayapprovalService;
+
+    @Resource
+    private BasePersonService basePersonService;
+
+
     /**
      * 分页查询
      *
@@ -346,5 +351,70 @@ public class PrjContractController extends BaseController {
     public String forApproveList() {
         return "prjcontract/list_approve";
     }
+
+
+    /**
+     * 获取电科院人员名单
+     */
+    @ResponseBody
+    @RequestMapping(value = "/dkyfzr", method = RequestMethod.GET)
+    public Object dkyfzr(@RequestParam("page") Integer pageNum,
+                         @RequestParam("limit") Integer pageSize,
+                         @RequestParam(required = false, defaultValue = "", value = "xm") String xm) {
+        PageHelper.startPage(pageNum, pageSize);
+
+        Map<String, String> paraMap = new HashMap<>();
+        paraMap.put("xm", xm);
+        List<BasePerson> list = basePersonService.getBasePersonList(paraMap);
+
+        PageInfo<BasePerson> pageinfo = new PageInfo<>(list);
+        // 取出查询结果
+        List<BasePerson> rows = pageinfo.getList();
+        int total = (int) pageinfo.getTotal();
+
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("code", 0);
+        resultMap.put("msg", "");
+        resultMap.put("count", total);
+        resultMap.put("data", list);
+
+        return resultMap;
+    }
+
+
+    /**
+     * 获取创建人
+     * @param pageNum
+     * @param pageSize
+     * @param cjr
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/cjr", method = RequestMethod.GET)
+    public Object dwlist(@RequestParam("page") Integer pageNum,
+                         @RequestParam("limit") Integer pageSize,
+                         @RequestParam(required = false, defaultValue = "", value = "name") String name) {
+        PageHelper.startPage(pageNum, pageSize);
+
+        Map<String, String> paraMap = new HashMap<>();
+        paraMap.put("name", name);
+        List<SysUserInfo> list = sysUserInfoService.getSysUserInfoList(paraMap);
+
+        PageInfo<SysUserInfo> pageinfo = new PageInfo<>(list);
+        // 取出查询结果
+        List<SysUserInfo> rows = pageinfo.getList();
+        int total = (int) pageinfo.getTotal();
+
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("code", 0);
+        resultMap.put("msg", "");
+        resultMap.put("count", total);
+        resultMap.put("data", list);
+
+        return resultMap;
+    }
+
+
+
 }
 

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

@@ -19,6 +19,7 @@ import com.liang.entity.baobiao.UtilEntity;
 import com.liang.service.*;
 //import com.liang.vo.service.*;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.collections4.CollectionUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -37,6 +38,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.crypto.Data;
 import java.io.*;
 import java.math.BigDecimal;
 import java.text.DateFormat;
@@ -579,11 +581,11 @@ public class PrjProjectController extends BaseController {
             model.addAttribute("project",project);
         }
         // 电科院负责人
-        List<BasePerson> list1 = basePersonService.getBasePersonList(map);
-        model.addAttribute("dkyfzr",list1);
-        // 申请人
+/*        List<BasePerson> list1 = basePersonService.getBasePersonList(map);
+        model.addAttribute("dkyfzr",list1);*/
+/*        // 申请人
         List<SysUserInfo> list2 = sysUserInfoService.getSysUserInfoList(map);
-        model.addAttribute("cjr",list2);
+        model.addAttribute("cjr",list2);*/
         return "prjproject/updateSsbm";
     }
 
@@ -2493,8 +2495,55 @@ public class PrjProjectController extends BaseController {
 
         return BaseResult.success(result);
     }
-
-
+    /**
+     * 项目转移
+     */
+    @ResponseBody
+    @RequestMapping(value = "/upssbm",method = RequestMethod.POST)
+    public BaseResult upSsbm(@RequestBody PrjProjects formData){
+        // 创建一个Object
+            // 开始解析 formData 将其解析成 Prjproject 对象
+            PrjProjects pr = new PrjProjects();
+        PrjProject prjProject = prjProjectService.queryById(formData.getId());
+        SysDeptInfo sysDeptInfo = sysDeptInfoService.queryById(formData.getSsbmmc());
+        // 获取当前系统时间
+        Date data = new Date();
+        // 转换时间格式
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        // 审批列表记录
+        PrjApproverecord prjApproverecord = new PrjApproverecord();
+        prjApproverecord.setTablename("prj_Project");
+        prjApproverecord.setXmid(formData.getId());
+        prjApproverecord.setYj( "项目名称："+formData.getXmmc1()+",ERP编号："+formData.getErpbh1()+","+"部门从'"+
+                prjProject.getSsbmmc()+"'转移至"+sysDeptInfo.getDeptName()+"'电科院负责人从'"+prjProject.getDkyfzrxm()+"'转移为："
+                +formData.getDkyfzrxm() +",创建人从"+
+                prjProject.getCjrxm()+"转移为："+
+                formData.getSqrxm()+",操作员："+
+                sysUserInfoService.queryById(getSysUserId()).getName());
+        prjApproverecord.setSfsjsh(true);
+        prjApproverecord.setSjshr(getSysUserId());
+        prjApproverecord.setShsj(format.format(data));
+        prjApproverecord.setTjsj(format.format(data));
+        prjApproverecord.setTjr(getSysUserId());
+        prjApproverecord.setShr(getSysUserId());
+        prjApproverecord.setSpcz("项目转移");
+        prjApproverecord.setXm(formData.getXmmc1());
+        prjApproverecord.setZt("已完成");
+        prjApproverecord.setWc(true);
+        int mun = prjApproverecordService.insert(prjApproverecord);
+            if (mun > 0 ){
+                pr.setSsbm(formData.getSsbmmc());
+                pr.setDkyfzr(formData.getDkyfzr1());
+                pr.setCjr(formData.getSqr1());
+                pr.setId(formData.getId());
+                int num = prjProjectService.updateZy(pr);
+                if (num > 0){
+                    return BaseResult.success("项目已成功转移!");
+                }
+            }
+            // 审批列表增加
+        return BaseResult.failure(-1,"项目转移失败！");
+    }
 
 
 }

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

@@ -2,6 +2,7 @@ package com.liang.dao;
 
 import com.liang.entity.FeeManagemant;
 import com.liang.entity.PrjProject;
+import com.liang.entity.PrjProjects;
 import com.liang.entity.StaBudgetapproval;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
@@ -188,4 +189,10 @@ public interface PrjProjectDao {
 
 
     void updateSFXG(Integer xmid);
+
+
+    /**
+     * 项目转移
+     */
+    int updateZy(PrjProjects prjProjects);
 }

src/main/java/com/liang/entity/PrjProject.java

@@ -202,5 +202,10 @@ public class PrjProject implements Serializable {
      */
     private Integer sfxg;
 
+    /**
+     * 申请人
+     */
+
+    private Integer sqrxm;
 }
 

src/main/java/com/liang/entity/PrjProjects.java

@@ -0,0 +1,42 @@
+package com.liang.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author ly
+ * @Date 2024/10/29 16:52
+ * @Version 1.0
+ */
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PrjProjects {
+
+    private Integer id;
+
+    private String xmmc1;
+
+    private String erpbh1;
+
+    private Integer ssbmmc;
+
+    private Integer ssbm1;
+
+    private String dkyfzr1;
+
+    private String dkyfzrxm;
+
+    private String sqr1;
+
+    private String sqrxm;
+
+    private String cjr;
+    private String dkyfzr;
+    private Integer ssbm;
+
+}

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

@@ -3,6 +3,7 @@ package com.liang.service;
 import com.liang.common.base.BaseResult;
 import com.liang.entity.FeeManagemant;
 import com.liang.entity.PrjProject;
+import com.liang.entity.PrjProjects;
 import com.liang.entity.StaBudgetapproval;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -167,4 +168,7 @@ public interface PrjProjectService {
     void updateSPTGZT1(Integer rws);
 
     void updateSFXG(Integer xmid);
+
+
+    int updateZy(PrjProjects prjProjects);
 }

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

@@ -498,5 +498,10 @@ public class PrjProjectServiceImpl implements PrjProjectService {
         prjProjectDao.updateSFXG(xmid);
     }
 
+    @Override
+    public int updateZy(PrjProjects prjProjects) {
+        return this.prjProjectDao.updateZy(prjProjects);
+    }
+
 
 }

src/main/resources/mapper/PrjProjectDao.xml

@@ -439,6 +439,22 @@
             SPZT       = #{spzt}
         where ID = #{id}
     </update>
+    <!-- 通过主键修改数据 -->
+    <update id="updateZy">
+        update prj_Project
+        set
+            <if test="ssbm != null and ssbm != ''">
+                SSBM = #{ssbm}
+            </if>
+        <if test="dkyfzr != null and dkyfzr != ''">
+            ,DKYFZR = #{dkyfzr}
+        </if>
+        <if test="cjr != null and cjr != ''">
+          ,CJR = #{cjr}
+        </if>
+            where ID = #{id}
+
+    </update>
 
     <!--通过主键删除-->
     <delete id="deleteById">

src/main/resources/mapper/SysUserInfoDao.xml

@@ -294,6 +294,9 @@
         <if test="postName != null and postName != ''">
             and p.post_name like '%'+#{postName}+'%'
         </if>
+        <if test="ssbm != null and ssbm != ''">
+            and d.dept_id = #{ssbm}
+        </if>
         <choose>
             <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">
                 order by ${sortName} ${sortOrder}

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

@@ -7,6 +7,13 @@
     <link rel="stylesheet" th:href="@{/lib/layui/css/layui.css}" media="all">
     <link rel="stylesheet" th:href="@{/css/public.css}" media="all">
     <link rel="stylesheet" th:href="@{/lib/font-awesome-4.7.0/css/font-awesome.min.css}" media="all">
+    <style>
+        .layui-btn-container {
+            display: flex; /* 启用弹性盒布局 */
+            flex-wrap: wrap; /* 如果需要，允许换行 */
+            gap: 3px; /* 可选：为按钮之间添加间距 */
+        }
+    </style>
 </head>
 <body>
 <div class="layuimini-container">
@@ -179,7 +186,8 @@
     var xmApproval = {};
     layui.use(['form', 'table'], function () {
         var form = layui.form,
-            table = layui.table;
+            table = layui.table,
+        layer = layui.layer;
         var userId = $("#userId").val();
         var postId = $("#postId").val();
 
@@ -233,7 +241,6 @@
 
         // 监听搜索操作
         form.on('submit(data-search-btn)', function (data) {
-
             // 执行搜索重载
             currTable.reload({
                 page: {
@@ -241,6 +248,13 @@
                 },
                 where: form.val("search-form")
             });
+            // 刷新按钮
+            var userId = $("#userId").val();
+            console.log("搜索"+userId);
+            if (userId == 1 || userId == 42){
+                document.getElementById('zy').style.display = 'block'
+                layer.msg('加载完成',{icon:1});
+            }
             return false;
         });
 
@@ -784,19 +798,6 @@
                 }else if (data[0].spzt != '审批结束'){
                     layer.msg('该任务书未审批结束，不能转移',{icon:3});
                 }else {
-                    // 项目转移后 ,项目之下的所有 年度预算、全部费用申请、报账列表转移
-/*                    layer.open({
-                        title: '项目转移',
-                        type: 2,
-                        shade: 0.3,
-                        maxmin: true,
-                        shadeClose: true,
-                        area: ['1090px', layerheight + 'px'],
-                        content: AjaxUtil.ctx + 'prjProject/updateSsbm?id='+ data[0].id,
-                            end: function (index) {
-                            layer.close(index);
-                        }
-                    });*/
                     layer.open({
                         title: '项目转移',
                         type: 2,
@@ -806,8 +807,10 @@
                         area: ['1090px', layerheight + 'px'],
                         content: AjaxUtil.ctx + 'prjProject/updateSsbm/' + data[0].id,
                         success: function (layero, index) {
+
                         },
                         end: function (index) {
+                            // 刷新表格
                             if (updateflag == 1)
                                 currTable.reload();
                             updateflag = 0;
@@ -818,7 +821,6 @@
             }
 
         });
-
         //双击
         table.on('rowDouble(currentTableFilter)', function (obj) {
             var data = obj.data;
@@ -857,11 +859,6 @@
 
         },1000);
     });
-
-
-
-
-
 </script>
 </body>
 </html>

src/main/resources/templates/prjproject/updateSsbm.html

@@ -1,9 +1,11 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
 <head>
     <meta charset="UTF-8">
     <title>项目转移</title>
     <link rel="stylesheet" th:href="@{/lib/layui/css/layui.css}" media="all">
+    <link rel="stylesheet" th:href="@{/css/public.css}" media="all">
+    <link rel="stylesheet" th:href="@{/lib/font-awesome-4.7.0/css/font-awesome.min.css}" media="all">
     <style>
         body {
             display: flex;
@@ -31,6 +33,7 @@
         h3 {
             text-align: center;
             margin-top: 0px;
+            color: #4ac14a;
         }
 
         .layui-form-item {
@@ -97,25 +100,26 @@
 <div class="right-section">
     <!-- 右侧内容 -->
     <h3>转移后</h3>
-    <form class="layui-form" action="" lay-filter="formDemo">
+    <form class="layui-form" action="" lay-filter="formDemo" id="myForm">
         <div class="layui-form layuimini-form">
             <div class="layui-form-item layui-inline" style="width: 100%">
                 <label class="layui-form-label required" style="width: 17%">项目名称</label>
                 <div class="layui-input-inline" style="width: 70%">
-                    <input type="text" id="xmmc1" name="xmmc" class="layui-input" th:value="${project.zwmc}" disabled>
+                    <input type="text" id="xmmc1" name="xmmc1" class="layui-input" th:value="${project.zwmc}" disabled>
+                    <input type="hidden" id="id" name="id" class="layui-input" th:value="${project.id}">
                 </div>
             </div>
             <div class="layui-form-item layui-inline" style="width: 100%">
                 <label class="layui-form-label" style="width: 17%">ERP编号</label>
                 <div class="layui-input-inline" style="width: 70%">
-                    <input type="text" id="erpbh1" name="erpbh" class="layui-input" th:value="${project.erpbh}" disabled>
+                    <input type="text" id="erpbh1" name="erpbh1" class="layui-input" th:value="${project.erpbh}" disabled>
                 </div>
             </div>
 
             <div class="layui-form-item layui-inline" style="width: 100%">
                 <label class="layui-form-label" style="width: 17%">所属部门<span style="color: red;">*</span></label>
                 <div class="layui-input-inline" style="width: 70%">
-                    <input type="hidden" id="ssbm1" name="ssbm" class="layui-input">
+                    <input type="hidden" id="ssbm1" name="ssbm1" class="layui-input">
                     <!-- 设置一个下拉框 -->
                     <select name="ssbmmc" id="ssbmmc"  lay-search>
                         <option value="">请选择</option>
@@ -127,28 +131,19 @@
             <div class="layui-form-item layui-inline" style="width: 100%">
                 <label class="layui-form-label" style="width: 17%">电科院负责人<span style="color: red;">*</span></label>
                 <div class="layui-input-inline" style="width: 70%">
-                    <input type="hidden" id="dkyfzr1" name="dkyfzr" class="layui-input">
-                    <!-- 设置一个下拉框选项 -->
-                    <select name="dkyfzrxm" id="dkyfzrxm"  lay-search>
-                        <option value="">请选择</option>
-                        <option th:each="item:${dkyfzr}" th:text="${item.xm}" th:value="${item.id}"></option>
-                    </select>
+                    <input type="hidden" id="dkyfzr1" name="dkyfzr1" class="layui-input">
+                    <input type="text" id = 'dkyfzrxm' name="dkyfzrxm" class="layui-input">
                 </div>
             </div>
             <div class="layui-form-item layui-inline" style="width: 100%">
                 <label class="layui-form-label" style="width: 17%">申请人<span style="color: red;">*</span></label>
                 <div class="layui-input-inline" style="width: 70%">
-                    <input type="hidden" id="sqr1" name="sqr" class="layui-input">
-                    <!-- 设置一个下拉框选项 -->
-                    <select name="sqrxm" id="sqrxm"  lay-search>
-                        <option value="">请选择</option>
-                        <option th:each="item:${cjr}" th:text="${item.name}" th:value="${item.userId}"></option>
-                    </select>
+                    <input type="hidden" id="sqr1" name="sqr1" class="layui-input">
+                    <input type="text" id = 'sqrxm' name="sqrxm" class="layui-input">
 
                 </div>
             </div>
         </div>
-    </form>
 
         <!-- 右侧悬浮按钮 -->
         <div class="right-bottom-btn">
@@ -159,31 +154,117 @@
                 <i class="layui-icon layui-icon-close"></i>取消
             </button>
         </div>
+    </form>
 </div>
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
-<script th:src="@{/lib/layui-v2.6.3/layui.js}" charset="utf-8"></script>
+<script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>
 <script th:src="@{/lib/coco-message/coco-message.js}" charset="utf-8"></script>
 <script th:src="@{/lib/xm-select-v1.2.2/xm-select.js}" charset="utf-8"></script>
 <script th:src="@{/js/lay-config.js}" charset="utf-8"></script>
 <script type="text/javascript" th:inline="javascript">
     AjaxUtil.ctx = /*[[@{/}]]*/'';
     var updateflag = 0;
-    var prjMember = [];
-    var prjCompany = [];
-    var subTopic = [];
-    var budgetCols = [];
-    layui.use(['form', 'table', 'treeTable', 'layCascader', 'tableSelect'], function () {
-        var table = layui.table,
+    var xmApproval = {};
+    // 初始化 LayUI
+    layui.use(['form','table','tableSelect'], function () {
+        var form = layui.form,
             layer = layui.layer,
-            treeTable = layui.treeTable;
-        var xmId = parseInt($("#id").val());
-        form.on('submit(saveBtn)', function (data) {
-            //
+            tableSelect = layui.tableSelect,
+        table = layui.table;
+        //获取创建人
+        tableSelect.render({
+            elem: '#sqrxm',
+            checkedKey: 'userid',
+            searchKey: 'name',
+            searchPlaceholder: '搜索申请人',
+            table:{
+                url:AjaxUtil.ctx+'prjContract/cjr',
+                cols:[
+                    [
+                        {type:'radio',title:'😊',width: '7%'},
+                        {type: 'numbers',title: '序号',align: 'center',width: '10%'},
+                        {field:'name',title: '姓名',align: 'center',width:'30%'},
+                        {field: 'deptName',title: '部门',align: 'left',width: '50%'}
+                    ]
+                ]
+            },
+            done: function (elem, data) {
+                var NEWJSON = [];
+                var NEWJSON1 = [];
+                layui.each(data.data, function (index, item) {
+                    NEWJSON.push(item.name);
+                    NEWJSON1.push(item.userId);
+                });
+                elem.val(NEWJSON.join(","));
+                $("#sqr1").val(NEWJSON1.join(","));
+                
+            }
+        });
+        // 获取电科院负责人
+        tableSelect.render({
+            elem: '#dkyfzrxm',
+            checkedKey: 'id',
+            searchKey: 'xm',
+            searchPlaceholder: '搜索电科院负责人',
+            table:{
+                url:AjaxUtil.ctx +'prjContract/dkyfzr',
+                cols: [
+                    [
+                        {type:'radio',title:'😊',width:'7%'},
+                        {type: 'numbers',title: '序号',align:'center',width: '10%'},
+                        {field: 'xm',title: '姓名',align: 'center',width: '30%'},
+                        {field: 'bmmc',title: '部门',align: 'left',width: '50%'}
 
+                    ]
+                ]
+            },
+            done: function (elem,data) {
+                var NEWJSON = [];
+                var NEWJSON1 = [];
+                layui.each(data.data, function (index, item) {
+                    NEWJSON.push(item.xm);
+                    NEWJSON1.push(item.id);
+                });
+                elem.val(NEWJSON.join(","));
+                $('#dkyfzr1').val(NEWJSON1.join(","));
 
+            }
         });
 
+        form.on('submit(saveBtn)', function (data) {
+            // 提交表单元素
+            // 将表单元素提交至后台
+            // 获取表单的数据
+            const travelExpenses = data.field; // data.field 包含表单的数据
+            // 将对象转换为 JSON 字符串
+            AjaxUtil.post({
+                url: AjaxUtil.ctx + 'prjProject/upssbm',
+                contentType: "application/json",
+                data: JSON.stringify(travelExpenses),
+                success: function (res) {
+                    console.log('hello');
+                    console.log(res);
+                    if (res.code === 0) {
+                        Message.success(1000,res.message,function (){
+
+                            setTimeout(function () {
+                                var index = parent.layer.getFrameIndex(window.name);
+                                parent.layer.close(index);
+                            },2000);
 
+                        });
+                        // 获取弹框 并关闭弹
+                    }else {
+                        layer.msg(res.message,{ icon:2 });
+                    }
+                },
+                error: function (error) {
+                    layer.msg("请求出错，请稍后重试！", { icon: 2 }); // 处理 Ajax 错误
+                }
+            });
+
+
+        });
         // 监听取消按钮
         $("button[lay-filter='cancleBtn']").click(function () {
             var iframeIndex = parent.layer.getFrameIndex(window.name);