费用申请逻辑优化

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

@@ -131,13 +131,8 @@ public class LsUserController {
 
     @RequestMapping(value = "/edit/{id}",method = RequestMethod.GET)
     public String forEdit(@PathVariable Integer id){
-
-
         return "lsuserinfo/add";
-
     }
-
-
     /**
      * 保存数据
      * @param
@@ -160,7 +155,6 @@ public class LsUserController {
             return BaseResult.success("新增临时人员成功!");
         }
             return BaseResult.failure("新建临时人员失败，该人员已存在!");
-
     }
 
     @RequestMapping(value="/update/{id}", method = RequestMethod.POST)
@@ -170,7 +164,6 @@ public class LsUserController {
         sysLsUserEntity.setId(id);
         sysLsUserEntity.setX(1);
         boolean a = lsUserService.upDate(sysLsUserEntity);
-
         if (a != true){
             return BaseResult.failure("修改失败");
         }

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

@@ -186,22 +186,15 @@ public class StaTempmemberController extends BaseController {
             boolean a = lsUserService.upDate(list1.get(0));
             return BaseResult.success("临时人员保存成功");
         }
-                removeCommonElement(list, memberList);
-                if (list.size()>0){
-                    for (int h = 0;h<list.size();h++){
-                        Map<String, String> map = new HashMap<>();
-                        map.put("xm",list.get(h).getXm());
-                        map.put("sfzh",list.get(h).getSfzh());
-                        List<SysLsUserEntity> list2 = lsUserService.getUserxm(map);
-                        if (list2.size() > 1){
-                            return BaseResult.failure("临时人员保存失败，身份证号与人名重复！");
-                        }
-                        list2.get(0).setZb(null);
-                        list2.get(0).setZt(0);
-                        boolean a = lsUserService.upDate(list2.get(0));
-                    }
-                    return BaseResult.success("临时人员保存成功");
-                }
+        // 删除 共有元素
+        // 先更改原有状态 ，后更改 现有数据
+        if (list.size()>0){
+            for (int i = 0;i<list.size();i++){
+                list.get(i).setZb(null);
+                list.get(i).setZt(0);
+                lsUserService.upDate(list.get(i));
+            }
+        }
                 if (memberList.size()>0){
                     for (int b = 0;b<memberList.size();b++){
                         Map<String, String> map = new HashMap<>();

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

@@ -967,15 +967,16 @@
                     {type: "checkbox", align: 'center'},
                     {type: 'numbers', align: 'center'},
                     {field: 'xm', title: '姓名', width: '9%'},
-                    {field: 'sfzh', title: '身份证号', width: '9%'},
-                    {field: 'qsrq', title: '聘用起始时间', width: '9%'},
-                    {field: 'jsrq', title: '聘用截止时间', width: '9%'},
-                    {field: 'fysq', title: '费用申请', width: '9%'},
-                    {field: 'bzfy', title: '报账费用', width: '9%'},
-                    {field: 'byxx', title: '毕业学校', width: '9%'},
-                    {field: 'zy', title: '专业', width: '9%'},
-                    {field: 'xl', title: '学历', width: '9%'},
-                    {field: 'gzdd', title: '工作地点', width: '9%'}
+                    {field: 'sfzh', title: '身份证号', width: '15%'},
+                    {field: 'qsrq', title: '聘用起始时间', width: '15%'},
+                    {field: 'jsrq', title: '聘用截止时间', width: '15%'},
+                    {field: 'fysq', title: '费用申请', width: '15%'},
+                    {field: 'bzfy', title: '报账费用', width: '15%'},
+                    {field: 'byxx', title: '毕业学校', width: '15%'},
+                    {field: 'zy', title: '专业', width: '15%'},
+                    {field: 'xl', title: '学历', width: '15%'},
+                    {field: 'gzdd', title: '工作地点', width: '15%'},
+                    {field: 'gznr', title: '工作内容', width: '20%'}
                 ]
             ],
             autoSort: false,

src/main/resources/templates/statistical/outPay.html

@@ -144,6 +144,8 @@
                     {field: 'XMBH', width: '7%', title: '项目编码'},
                     {field: 'BM', width: '15%', title: '所属部门', sort: true},
                     {field: 'XMMC', width: '10%', title: '项目名称'},
+                    {field: 'NF', width: '7%', title: '年份'},
+                    {field: 'ERPBH', width: '10%', title: 'ERP编号'},
                     {field: 'YQCG', width: '9%', title: '预期成果'},
                     {field: 'QSRQ', width: '10%', title: '开始时间'},
                     {field: 'JSRQ', width: '10%', title: '结束时间'},