登录页面、项目转移bug 修改

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

@@ -171,7 +171,7 @@ public class HomeController extends BaseController {
 
             return BaseResult.success("登录成功!");
         } else {
-            return BaseResult.success("登录失败!");
+            return BaseResult.failure(1,"密码错误，登录失败!");
         }
     }
 

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

@@ -2077,38 +2077,40 @@ public class StaBudgetapprovalController extends BaseController {
     @RequestMapping(value = "bgbm",method = RequestMethod.POST)
     public BaseResult bgbm(@RequestBody String formData){
 
+        // 解析JSON 为对象
         StaBudgetapproval sta = JsonTool.parseObject(formData,StaBudgetapproval.class);
         StaBudgetapproval staBudgetapproval = staBudgetapprovalService.queryById(sta.getId());
         // 增加审批列表留痕选项
         // 获取当前系统时间
-        Date data = new Date();
         // 转换时间格式
+        Date data = new Date();
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         // 审批列表记录
-        PrjApproverecord prjApproverecord = new PrjApproverecord();
-        prjApproverecord.setTablename("sta_BudgetApproval");
-        prjApproverecord.setXmid(staBudgetapproval.getXmid());
-        prjApproverecord.setYj( "项目名称："+staBudgetapproval.getXmmc()+",ERP编号："+staBudgetapproval.getErpbh()+","+"'部门'从'"+
-                staBudgetapproval.getSsbmmc()+"'转移至'"+sta.getSsbmmc()+","+
-                ",操作员："+
-                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(staBudgetapproval.getXmmc());
-        prjApproverecord.setZt("已完成");
-        prjApproverecord.setWc(true);
         if (staBudgetapproval != null){
-            staBudgetapproval.setSsbm(staBudgetapproval.getSsbm());
-            int num = staBudgetapprovalService.update(staBudgetapproval);
+            staBudgetapproval.setSsbm(Integer.parseInt(sta.getSsbmmc()));
+            int num = staBudgetapprovalService.updatebmbg(staBudgetapproval);
             if (num > 0){
+                PrjApproverecord prjApproverecord = new PrjApproverecord();
+                prjApproverecord.setTablename("sta_BudgetApproval");
+                prjApproverecord.setXmid(staBudgetapproval.getXmid());
+                prjApproverecord.setYj( "项目名称："+staBudgetapproval.getXmmc()+",ERP编号："+staBudgetapproval.getErpbh()+","+"'部门'从'"+
+                        staBudgetapproval.getSsbmmc()+"'转移至'"+sta.getSsbmmc()+","+
+                        ",操作员："+
+                        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(staBudgetapproval.getXmmc());
+                prjApproverecord.setZt("已完成");
+                prjApproverecord.setWc(true);
                 int muns = prjApproverecordService.insert(prjApproverecord);
-                return  BaseResult.success("'"+staBudgetapproval.getErpbh()+"'部门转移成功！");
-
+                if (muns > 0){
+                    return  BaseResult.success("'"+staBudgetapproval.getErpbh()+"'部门转移成功！");
+                }
             }
         }
             return BaseResult.failure(-1, "数据转移失败！");

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

@@ -82,6 +82,8 @@ public interface StaBudgetapprovalDao {
      * @return 影响行数
      */
     int update(StaBudgetapproval staBudgetapproval);
+
+    int updatebmbg(StaBudgetapproval staBudgetapproval);
     int updateImprest(StaBudgetapproval staBudgetapproval);
     int ImprestConnect(StaBudgetapproval staBudgetapproval);
 

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

@@ -142,7 +142,9 @@ public class StaBudgetapproval implements Serializable {
     /**
      * 所属部门
      */
+
     private Integer ssbm;
+
     @JsonProperty("ssbmmc")
     private String ssbmmc;
     /**

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

@@ -50,6 +50,8 @@ public interface StaBudgetapprovalService {
      * @return 实例对象
      */
     int update(StaBudgetapproval staBudgetapproval);
+
+    int updatebmbg(StaBudgetapproval staBudgetapproval);
     int updateImprest(StaBudgetapproval staBudgetapproval);
     int ImprestConnect(StaBudgetapproval staBudgetapproval);
 

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

@@ -279,5 +279,9 @@ public class StaBudgetapprovalServiceImpl implements StaBudgetapprovalService {
         return this.staBudgetapprovalDao.getSqe(map);
     }
 
+    @Override
+    public int updatebmbg(StaBudgetapproval staBudgetapproval){
+        return this.staBudgetapprovalDao.updatebmbg(staBudgetapproval);
+    };
 
 }

src/main/resources/mapper/StaBudgetapprovalDao.xml

@@ -352,6 +352,12 @@
             ,SF = #{sf}
         where ID = #{id}
     </update>
+    <update id="updatebmbg">
+        update sta_BudgetApproval
+        set SSBM = #{ssbm}
+        where ID = #{id}
+    </update>
+
     <!--    修改方法-->
     <!--通过主键修改基础数据-->
     <update id="updateImprest">

src/main/resources/templates/login/login.html

@@ -356,7 +356,13 @@
         var layer = layui.layer;
         var loginStatus = [[${loginStatus}]];
         if (loginStatus === 'redirect') {
-            layer.alert("会话已过期，请重新登录")
+            Message.error("会话已过期，请重新登录！");/*
+            layNotify.notice({
+                title: "登录提示",
+                type: "warning",
+                message: "会话已过期，请重新登录"
+            });*/
+            return false;
         }
         // 登录过期的时候，跳出ifram框架
         if (top.location != self.location) {
@@ -469,7 +475,11 @@
                             message: res.message
                         });
                         // document.getElementById("ver_btn").click();
-                        document.getElementById("captcha").value = '';
+                        // 验证码刷新
+                       /* document.getElementById("captcha").value = '';*/
+                        document.getElementById("password").value = '';
+                        console.log(res.message);
+                        // 阻止后续操作
                     }
                 },
                 error: function (error) {

src/main/resources/templates/stabudgetapproval/bmbg.html

@@ -249,7 +249,8 @@
                             setTimeout(function () {
                                 var index = parent.layer.getFrameIndex(window.name);
                                 parent.layer.close(index);
-                            },1000);
+                            },500);
+
 
                         });
                         // 获取弹框 并关闭弹

src/main/resources/templates/stabudgetapproval/update_approve.html

@@ -239,10 +239,10 @@
                     url: AjaxUtil.ctx + 'sysUserPost/postUserlist/' + postId,
                     cols: [
                         [
-                            {type: "radio", fixed: 'left'},
-                            {type: 'numbers', align: 'center'},
-                            {field: 'name', width: '40%', title: '姓名', align: 'left'},
-                            {field: 'account', title: '账号', align: 'left'}
+                            {type: "radio", fixed: 'left',title: '😊'},
+                            {type: 'numbers', align: 'center',title: '序号',width: '7%'},
+                            {field: 'name', width: '40%', title: '姓名', align: 'left',},
+                            {field: 'account', title: '账号', align: 'left',width: '40%'}
                         ]
                     ]
                 },

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

@@ -850,8 +850,6 @@
 
                     }
                 });
-
-
             } else if (obj.event === 'xmzy') {
                 var project = table.cache['currentTableId'];//  绑定表格元素 cache 表示缓存的意思
                 // 判断缓存是否为空
@@ -876,13 +874,12 @@
                         shadeClose: true,
                         area: ['1090px', layerheight + 'px'],
                         content: AjaxUtil.ctx + 'staBudgetapproval/updateSsbm?id=' + data[0].id,
-                        success: function (layero, index) {
-                        },
                         end: function (index) {
                             // 刷新表格
-                            if (updateflag == 1)
+                            if (updateflag == 1){
                                 currTable.reload();
-                            updateflag = 0;
+                                updateflag = 0;
+                            }
                         }
                     });
                 }