Merge branch 'master' into dev-lgl

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

@@ -0,0 +1,63 @@
+package com.liang.common.utils;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.Locale;
+
+/**
+ * @Author ly
+ * @Date 2024/6/30 17:44
+ * @Version 1.0
+ */
+public class DateUtil {
+    public String convertDate(String inputDate) {
+        if (inputDate == null || inputDate.isEmpty()) {
+            return "";
+        }
+        // 定义输入格式的日期时间格式化器
+        DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("dd-LLL-yyyy", Locale.CHINESE);
+
+        // 将字符串解析为 LocalDate 对象
+        LocalDate date = LocalDate.parse(inputDate, inputFormatter);
+
+        // 定义输出格式的日期时间格式化器
+        DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+        // 格式化日期为所需的输出格式
+        String formattedDate = date.format(outputFormatter);
+
+        return formattedDate;
+    }
+    /**
+     * 判断两个给定日期是否相差少于三个月
+     * @param startDate 开始日期
+     * @param endDate 结束日期
+     * @return 如果 startDate 和 endDate 相差少于三个月返回 true，否则返回 false
+     */
+    public boolean isWithinThreeMonths(LocalDate startDate, LocalDate endDate) {
+        // 计算 startDate 和 endDate 之间的月份差距
+        long monthsApart = ChronoUnit.MONTHS.between(startDate, endDate);
+
+        // 判断绝对差距是否小于三个月
+        return Math.abs(monthsApart) < 3;
+    }
+    public  boolean areDatesWithinThreeMonths(String startDateStr, String endDateStr) {
+        if (startDateStr.isEmpty() || endDateStr.isEmpty() ){
+            return false;
+        }
+        // 将字符串日期转换为 LocalDate 对象
+        LocalDate startDate = LocalDate.parse(startDateStr, DateTimeFormatter.ISO_DATE);
+        LocalDate endDate = LocalDate.parse(endDateStr, DateTimeFormatter.ISO_DATE);
+
+        // 使用已有方法检查
+        return areDatesWithinThreeMonths(startDate, endDate);
+    }
+    public  boolean areDatesWithinThreeMonths(LocalDate startDate, LocalDate endDate) {
+        // 计算 startDate 和 endDate 之间的月份差距
+        long monthsApart = ChronoUnit.MONTHS.between(startDate, endDate);
+
+        // 判断绝对差距是否小于三个月
+        return Math.abs(monthsApart) < 3;
+    }
+}

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

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseResult;
+import com.liang.common.utils.DateUtil;
 import com.liang.entity.BasePerson;
 import com.liang.entity.SysLsUserEntity;
 
@@ -12,20 +13,36 @@ import com.liang.service.BaseEducationService;
 import com.liang.service.LsUserService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.ibatis.annotations.Delete;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import javax.annotation.Resource;
 import javax.xml.transform.Result;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 
 import static com.liang.common.base.BaseController.RESULT_ROWS;
 import static com.liang.common.base.BaseController.RESULT_TOTAL;
@@ -44,6 +61,10 @@ public class LsUserController {
     @Resource
     private BaseEducationService baseEducationService;
 
+    // 允许的表格文件扩展名列表
+    private final List<String> allowedExtensions = Arrays.asList("xls", "xlsx", "csv");
+
+
     @ApiOperation(value = "页面初始化", notes = "页面初始化")
     @RequestMapping(value = "/init", method = RequestMethod.GET)
     public String init( Model model) {
@@ -61,12 +82,14 @@ public class LsUserController {
                               @RequestParam("limit") Integer pageSize,
                               @RequestParam(required = false, defaultValue = "", value = "xm") String xm,
                               @RequestParam(required = false, defaultValue = "", value = "zt") Integer zt,
-                              @RequestParam(required = false, defaultValue = "", value = "xl") String xl){
+                              @RequestParam(required = false, defaultValue = "", value = "xl") String xl,
+                              @RequestParam(required = false, defaultValue = "", value = "sfzh") String sfzh){
         Map<String, String> paraMap = new HashMap<>();
         PageHelper.startPage(pageNum, pageSize);
         if (zt == null){
             paraMap.put("xm", xm);
             paraMap.put("xl",xl);
+            paraMap.put("sfzh",sfzh);
             List<SysLsUserEntity> list = lsUserService.UserAll(paraMap);
             PageInfo<SysLsUserEntity> pageinfo = new PageInfo<>(list);
             // 取出查询结果
@@ -206,5 +229,125 @@ public class LsUserController {
         return BaseResult.failure("该人员不存在");
     }
 
+    @PostMapping("/file")
+    @ResponseBody
+    public BaseResult handleFileUpload(@RequestParam("file") MultipartFile file) {
+        if (file.isEmpty()){
+            return BaseResult.failure("上传文件异常，上传失败！");
+        }
+        List<SysLsUserEntity> lists = new ArrayList<>();
+        Integer h = 0;
+        try{
+            // 验证文件类型
+
+            DateUtil dateUtil = new DateUtil();
+            String fileExtension = FilenameUtils.getExtension(file.getOriginalFilename());
+            if (!allowedExtensions.contains(fileExtension.toLowerCase())) {
+                return BaseResult.failure("只允许上传 Excel文件");
+            }
+            // 开始解析这个文件
+            List<List<String>> spreadsheetData = parseSpreadsheet(file.getInputStream(), fileExtension);
+            System.out.println(spreadsheetData);
+            spreadsheetData.remove(0);
+            List<SysLsUserEntity> list = new ArrayList<>();
+            for (List<String> row : spreadsheetData) {
+                SysLsUserEntity employee = new SysLsUserEntity();
+                // 设置员工信息
+                employee.setXm(row.get(0));
+                employee.setXb(row.get(1));
+                employee.setPhone(row.get(2));
+                employee.setSfzh(row.get(3));
+                employee.setXl(row.get(4));
+                employee.setByxy(row.get(5));
+                employee.setZy(row.get(6));
+                employee.setQpsj(dateUtil.convertDate(row.get(7)));
+                employee.setDqsj(dateUtil.convertDate(row.get(8)));
+                employee.setGznr(row.get(9));
+                // 将对象添加到列表中
+                list.add(employee);
+            }
+            System.out.println(list);
+
+            for(int i = 0; i<list.size();i++){
+                SysLsUserEntity sysLsUserEntity = new SysLsUserEntity();
+                // 校验合同起始时间和到期时间是否在三个月 内
+                if (dateUtil.areDatesWithinThreeMonths(list.get(i).getDqsj(), list.get(i).getQpsj()) !=true) {
+                    sysLsUserEntity.setXm(list.get(i).getXm());
+                    // xmfzr 这个字段存储未能存储原因
+                    sysLsUserEntity.setXmfzr("聘用日期不能大于三个月");
+                    sysLsUserEntity.setSfzh(list.get(i).getSfzh());
+                    sysLsUserEntity.setDqsj(list.get(i).getDqsj());
+                    sysLsUserEntity.setQpsj(list.get(i).getQpsj());
+                    if (list.get(i).getXm().isEmpty() && list.get(i).getSfzh().isEmpty()){
+                        continue;
+                    }
+                    lists.add(sysLsUserEntity);
+                    continue;
+                }
+                // 校验当前传入的 身份证号 是否在数据库中存在
+                if (lsUserService.jy(list.get(i).getSfzh()) != true){
+                    sysLsUserEntity.setXm(list.get(i).getXm());
+                    sysLsUserEntity.setSfzh(list.get(i).getSfzh());
+                    sysLsUserEntity.setDqsj(list.get(i).getDqsj());
+                    sysLsUserEntity.setQpsj(list.get(i).getQpsj());
+                    // xmfzr 这个字段存储未能存储原因
+                    sysLsUserEntity.setXmfzr("该人员身份证已存在");
+                    if (list.get(i).getXm().isEmpty() && list.get(i).getSfzh().isEmpty()){
+                        continue;
+                    }
+                    lists.add(sysLsUserEntity);
+
+                    continue;
+                }
+               Integer mum = lsUserService.saveOperLog(list.get(i));
+               if (mum > 0){
+                   h++;
+                   continue;
+               }
+            }
+        }catch (Exception a){
+            a.printStackTrace();
+        }
+
+        // 获取文件名后缀
+        if (h == 0){
+            return BaseResult.failure(43,"成员录入失败,人员已存在！");
+        }
+        return BaseResult.success("成员录入成功",lists);
+    }
+    private List<List<String>> parseSpreadsheet(InputStream inputStream, String fileExtension) throws IOException {
+        Workbook workbook = null;
+        if (fileExtension.equalsIgnoreCase("xlsx")) {
+            workbook = new XSSFWorkbook(inputStream);
+        } else if (fileExtension.equalsIgnoreCase("xls")) {
+            throw new IOException("上传的Excel文件格式不支持，请上传xlsx格式文件。");
+        } else if (fileExtension.equalsIgnoreCase("csv")) {
+            throw new IOException("上传的文件是CSV格式，当前不支持解析，请上传Excel文件。");
+        }
+
+        List<List<String>> spreadsheetData = new ArrayList<>();
+        if (workbook != null) {
+            Sheet sheet = workbook.getSheetAt(0);
+            Iterator<Row> iterator = sheet.iterator();
+
+            while (iterator.hasNext()) {
+                Row currentRow = iterator.next();
+                Iterator<Cell> cellIterator = currentRow.iterator();
+
+                List<String> rowData = new ArrayList<>();
+                while (cellIterator.hasNext()) {
+                    Cell currentCell = cellIterator.next();
+                    rowData.add(currentCell.toString());
+                }
+
+                spreadsheetData.add(rowData);
+            }
+
+            workbook.close();
+        }
+
+        return spreadsheetData;
+    }
+
 
 }

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

@@ -1,6 +1,7 @@
 package com.liang.controller;
 
 import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
@@ -178,8 +179,15 @@ public class StaSourceFeeController extends BaseController {
     //资料费用全部及条件查询
     @ResponseBody
     @RequestMapping(value = "/searchData", method = RequestMethod.POST)
-    public BaseResult searchData(@RequestParam(required = false, defaultValue = "", value = "MC") String mc, @RequestParam(required = false, defaultValue = "", value = "TSMC") String tsmc, @RequestParam(required = false, defaultValue = "", value = "CBS") String cbs, @RequestParam(required = false, defaultValue = "", value = "QSRQ") String qsrq, @RequestParam(required = false, defaultValue = "", value = "JZRQ") String jzrq) {
+    public BaseResult searchData(@RequestParam("page") Integer pageNum,
+                                 @RequestParam("limit") Integer pageSize,
+                                 @RequestParam(required = false, defaultValue = "", value = "MC") String mc,
+                                 @RequestParam(required = false, defaultValue = "", value = "TSMC") String tsmc,
+                                 @RequestParam(required = false, defaultValue = "", value = "CBS") String cbs,
+                                 @RequestParam(required = false, defaultValue = "", value = "QSRQ") String qsrq,
+                                 @RequestParam(required = false, defaultValue = "", value = "JZRQ") String jzrq) {
         List<HashMap<String, Object>> staFeasibilityreport = staSourceFeeService.searchSourceCost(mc, tsmc, cbs, qsrq, jzrq);
+        PageHelper.startPage(pageNum, pageSize);
         PageInfo<HashMap<String, Object>> pageinfo = new PageInfo<>(staFeasibilityreport);
         List<HashMap<String, Object>> rows = pageinfo.getList();
         int total = (int) pageinfo.getTotal();

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

@@ -76,8 +76,12 @@ public class StaStatisticalSummaryController extends BaseController {
                                      @RequestParam(required = false, defaultValue = "", value = "QS") String qs,
                                      @RequestParam(required = false, defaultValue = "", value = "WC") String wc
     ) {
+        Map<String, String> map = new HashMap<>();
+        map.put("xmmc",xmmc);
+        map.put("qs",qs);
+        map.put("wc",wc);
         PageHelper.startPage(pageNum, pageSize);
-        List<HashMap<String, Object>> staFeasibilityreport = staStatisticalSummaryService.projectPay(xmmc, qs, wc);
+        List<HashMap<String, Object>> staFeasibilityreport = staStatisticalSummaryService.projectPay(map);
         PageInfo<HashMap<String, Object>> pageinfo = new PageInfo<>(staFeasibilityreport);
         List<HashMap<String, Object>> rows = pageinfo.getList();
         int total = (int) pageinfo.getTotal();
@@ -93,7 +97,9 @@ public class StaStatisticalSummaryController extends BaseController {
     @RequestMapping(value = "/getAll",method = RequestMethod.GET)
     public BaseResult getAll(){
 
-        List<HashMap<String, Object>> staFeasibilityreport = staStatisticalSummaryService.projectPay("", "", "");
+        Map<String, String> map = new HashMap<>();
+
+        List<HashMap<String, Object>> staFeasibilityreport = staStatisticalSummaryService.projectPay(map);
         return BaseResult.success(staFeasibilityreport);
     }
 

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

@@ -106,7 +106,7 @@ public class SysUserPostController extends BaseController {
 //系统当前用户
         SysUserInfo userInfo = getSysUserInfo();
         if (userInfo != null && userInfo.getDeptId().equals("52")) {
-            paraMap.put("postName", PostInfoEnum.FZR.postName());
+            paraMap.put("postName", PostInfoEnum.KJBBMZR.postName());
         } else {
             paraMap.put("postName", PostInfoEnum.KYFZR.postName());
         }

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

@@ -128,6 +128,6 @@ public interface PrjFeeschemeDao {
 
     double queryByCzje(double czje);
 
-    double getNdFeeSchemeofDKY(Map map);
+    Double getNdFeeSchemeofDKY(Map map);
 }
 

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

@@ -2,6 +2,7 @@ package com.liang.dao;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 统计报表汇总表
@@ -18,5 +19,5 @@ public interface StaStatisticalSummaryDao {
      */
     List<HashMap<String, Object>> outPaySummary(String XMMC, String QSRQ, String JSRQ);
 
-    List<HashMap<String, Object>> projectPay(String XMMC, String QS, String WC);
+    List<HashMap<String, Object>> projectPay(Map map);
 }

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

@@ -52,4 +52,5 @@ public interface LsUserService {
 
 
     List<SysLsUserEntity> getZb(Integer zb);
+    boolean jy(String sfzh);
 }

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

@@ -6,6 +6,7 @@ import org.springframework.data.domain.PageRequest;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 经费预算(StaBudget)表服务接口
@@ -25,6 +26,6 @@ public interface StaStatisticalSummaryService {
      */
     List<HashMap<String, Object>> outPaySummary(String XMMC, String QSRQ, String JSRQ);
 
-    List<HashMap<String, Object>> projectPay(String xmmc, String qs, String wc);
+    List<HashMap<String, Object>> projectPay(Map map);
 
 }

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

@@ -15,6 +15,7 @@ import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -82,6 +83,17 @@ public class LsUserServiceImpl implements LsUserService {
         return this.lsUserDao.getZb(zb);
     }
 
+    @Override
+    public boolean jy(String sfzh) {
+        Map<String, String>map = new HashMap<>();
+        map.put("sfzh",sfzh);
+        List<SysLsUserEntity> sysLsUserEntity = lsUserDao.getUserxm(map);
+        if (sysLsUserEntity.size()>0){
+            return false;
+        }
+        return true;
+    }
+
     @Override
     public int batchDelete(List<Integer> idList) {
 

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

@@ -7,6 +7,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service("staStatisticalSummaryService")
 public class StaStatisticalSummaryServiceImpl implements StaStatisticalSummaryService {
@@ -20,8 +21,8 @@ public class StaStatisticalSummaryServiceImpl implements StaStatisticalSummarySe
     }
 
     @Override
-    public List<HashMap<String, Object>> projectPay(String xmmc, String qs, String wc) {
-        return staStatisticalSummaryDao.projectPay(xmmc, qs, wc);
+    public List<HashMap<String, Object>> projectPay(Map map) {
+        return staStatisticalSummaryDao.projectPay(map);
     }
 
 }

src/main/resources/mapper/LsUserDao.xml

@@ -39,6 +39,9 @@
                  <if test="zt != null and zt != ''">
                  and ZT = #{zt}
                  </if>
+                    <if test="sfzh != null and sfzh != ''">
+                        and SFZH = #{sfzh}
+                    </if>
                  order by cjsj DESC
 
     </select>

src/main/resources/mapper/PrjApproverecordDao.xml

@@ -509,7 +509,7 @@
         from prj_ApproveRecord a
         left join sys_user_info u1 on a.TJR = u1.user_id
         left join sys_user_info u2 on a.SHR = u2.user_id
-        where a.XMID = #{xmid} and a.TABLENAME = #{tableName}
+        where a.XMID = #{xmid}
         <if test="spzt != null and spzt != ''">
             and a.ZT = #{spzt}
         </if>
@@ -521,13 +521,18 @@
                 order by ${sortName} ${sortOrder} DESC
             </when>
         </choose>
-        order by a.id DESC
+        order by a.id asc
+    </select>
+    <select id="getOldApproveRecord" resultType="com.liang.entity.PrjApproverecord">
+        SELECT TOP 1 * FROM prj_ApproveRecord WHERE XMID = #{xmid} ORDER BY ID DESC
     </select>
 
     <update id="updateRevokeRecord">
         UPDATE prj_ApproveRecord
-        SET WC=1
-        WHERE ID = (SELECT TOP 1 ID FROM prj_ApproveRecord WHERE XMID = #{xmid} ORDER BY ID DESC)
+        SET WC = 1,
+            SPCZ = '撤销审批',
+            SHSJ =  CURRENT_TIMESTAMP
+        WHERE ID = (SELECT TOP 1 ID FROM prj_ApproveRecord WHERE XMID = #{xmid} ORDER BY ID DESC);
     </update>
 
 </mapper>

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

@@ -440,8 +440,7 @@
                     </button>
                 </div>
             </div>
-        </div>
-            </div>
+
 </form>
 </div>
 <!--常规结束-->
@@ -605,7 +604,8 @@
                         console.log(ysqjeOne);
                         dataTj[0].ysqje = parseFloat($("#sqje").val()) + ysqjeOne;//此科目已申请
                         if (ybzjeOne != -1) {
-                            dataTj[1].ysqje = dataTj[1].ysqje - parseFloat($("#sqje").val());//此科目已报账
+                            // dataTj[1].ysqje = dataTj[1].ysqje - parseFloat($("#sqje").val());//此科目已报账
+                            dataTj[1].ysqje = dataTj[0].ysje * 10000- dataTj[0].ysqje
                         }
                     }
                     // dataTj[1].ysqje=nysje-sqls;//项目年度经费中的已申请
@@ -3492,15 +3492,17 @@
             var nysje = parseFloat(dataTj[1].ysje) * 10000;//年度预算金额
             var ysqje = parseFloat(dataTj[0].ysqje);
             var nysqje = parseFloat(dataTj[1].ysqje);
-            if (sqje + ysqje > nysje) {
+            if (ysqje > nysje || sqje>nysje) {
                 Message.error("费用申请的总金额，不能超过年度总预算!", 2000);
                 return false;
-            } else if ($("#fjmc").val().indexOf("业务费") > -1) {
-                if (ysqje > ysje * 1.2) {
-                    Message.error("业务费申请的总金额，不能超过预算金额的20%!", 2000);
-                    return false;
-                }
-            } else if (ysqje > ysje*1.2) {
+            }
+            // else if ($("#fjmc").val().indexOf("业务费") > -1) {
+            //     if (ysqje > ysje * 1.2) {
+            //         Message.error("业务费申请的总金额，不能超过预算金额的20%!", 2000);
+            //         return false;
+            //     }
+            // }
+           if (ysqje > ysje || sqje >ysje) {
                 Message.error("该科目申请的费用总金额，不能超过预算金额!", 2000);
                 return false;
             }

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

@@ -106,7 +106,7 @@
                             <label class="layui-form-label" style="width: 90px">电科院负责人</label>
                             <div class="layui-input-inline" style="width: 370px">
                                 <input type="text" id="xmfzrxm" name="xmfzrxm" class="layui-input"
-                                       th:value="${annualbudget.xmfzrxm}" readonly>
+                                       th:value="${annualbudget.dkyfzrxm}" readonly>
                             </div>
                             <label class="layui-form-label" style="width: 65px">所属部门</label>
                             <div class="layui-input-inline" style="width: 370px">

src/main/resources/templates/lsuserinfo/adds.html

@@ -48,8 +48,7 @@
             </div>
             <label class="layui-form-label" style="width: 80px;top: 10px">毕业学校</label>
             <div class="layui-input-inline" style="width: 250px;top: 10px">
-                <input type="hidden" id="byxx" name="byxy" class="layui-input">
-                <input type="text" id="byxxmc" name="byxxmc" class="layui-input">
+                <input type="text" id="byxy" name="byxy" class="layui-input" th:value="${ls.byxy}">
             </div>
 
             <label class="layui-form-label required" style="width:80px;top: 20px;">电话</label>
@@ -105,44 +104,7 @@
         laydate.render({
             elem: '#dqsj'
         });
-        //毕业学校
-        var index3 = layer.load(0, {shade: 0.1});
-        AjaxUtil.get({
-            url: AjaxUtil.ctx + 'baseSchool/list',
-            success: function (res) {
-                layer.close(index3);
-                var datalist = [];
-                for (let item of res.data) {
-                    item.value = item.id;
-                    item.label = item.name;
-                    datalist.push(item);
-                }
-                // 扁平数据转树
-                var options = arrayToTree(datalist, "0");
-
-                // 初始化cascader实例
-                cascader = layCascader({
-                    elem: '#byxxmc',
-                    clearable: true,
-                    props: {
-                        checkStrictly: false // 配置选择任意一级选项
-                    },
-                    options: options
-                });
 
-                // 监听cascader变化
-                cascader.changeEvent(function (value, node) {
-                    $("#byxx").val(value);
-                    $("#byxxmc").val(node.data.label);
-                    // 主动关闭面板
-                    cascader.close();
-                });
-            },
-            error: function (error) {
-                layer.close(index3);
-                Message.error('获取学校信息失败！', 1000);
-            }
-        });
         //监听专业专长
         form.on('select(zyzc)', function (data) {
             let text = data.elem.selectedOptions[0].text;

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

@@ -35,6 +35,12 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 80px">身份证号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="sfzh" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
                         <div class="layui-inline">
                             <div class="layui-inline">
                                 <label class="layui-form-label " style="width: 40px;">状态</label>
@@ -67,20 +73,14 @@
                     <i class="layui-icon layui-icon-addition" style="font-size: 10px;"></i>新增
                 </button>
                 <button class="layui-btn layui-btn-sm" lay-event="export" >
-                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>全部导出
+                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>批量导出
                 </button>
                 <button class="layui-btn layui-btn-sm" lay-event="download"  style="background-color: purple">
                     <i class="layui-icon layui-icon-download-circle" style="font-size: 10px;"></i>模板下载
                 </button>
-            </div>
-            <!--文件上传的div-->
-            <div class="layui-upload-drag" id="excel">
-                <i class="layui-icon"></i>
-                <p>点击上传，或将文件拖拽到此处</p>
-                <div class="layui-hide" id="uploadDemoView">
-                    <hr>
-                    <img src="" alt="上传成功后渲染" style="max-width: 196px">
-                </div>
+                <button type="button" class="layui-btn layui-btn-sm" id="test3">
+                    <i class="layui-icon"></i>批量导入
+                </button>
             </div>
 
         </script>
@@ -109,22 +109,11 @@
 <script type="text/javascript" th:inline="javascript">
     AjaxUtil.ctx = /*[[@{/}]]*/'';
     var updateflag = 0;
-    layui.use(['form', 'table'], function () {
+    layui.use(['form', 'table','upload'], function () {
         var form = layui.form,
             table = layui.table,
             layer = layui.layer,
-            upload = layui.upload;
-        upload.render({
-            elem: '#excel',
-            url:AjaxUtil.ctx +'',
-            accept:'file',
-            done: function (res) {
-                layer.msg(res.msg);
-                console.log(res);
-                
-            }
-        });
-
+         upload = layui.upload;
         var currTable = table.render({
             elem: '#currentTableId',
             url: AjaxUtil.ctx + 'lsUser/all',
@@ -170,7 +159,59 @@
                 console.log(JSON.stringify(permissionSet));
             }
         });
+        //指定允许上传的文件类型
+        upload.render({
+            elem: '#test3'
+            , url: AjaxUtil.ctx + 'lsUser/file'
+            , method: 'post'
+            , accept: 'file' //普通文件
+            , done: function (res) {
+                console.log(res);
+                console.log(res.code);
+                if (res.code === 43) {
+                    layer.msg(res.message);
+                }else {
+                    if (res.data && Array.isArray(res.data) && res.data.length > 0) {
+                        // 安全访问数组元素或对象属性
+                        layer.msg(res.message);
+                        table.reload('currentTableId');
+                    }
+                    console.log(res);
+                    // 将 JSON 数据转换成 HTML 表格格式
+                    var tableHtml = '<table class="layui-table"><thead><tr>' +
+                        '<th>姓名</th>' +
+                        '<th>身份证号</th>' +
+                        '<th>起聘时间</th>' +
+                        '<th>到期时间</th>' +
+                        '<th>原因</th>' +
+                        '</tr></thead><tbody>';
+                    for(var i = 0; i < res.data.length; i++) {
+                        var xm = res.data[i].xm || 'N/A';
+                        var sfzh = res.data[i].sfzh || 'N/A';
+                        var qpsj = res.data[i].qpsj || 'N/A';
+                        var dqsj = res.data[i].dqsj || 'N/A';
+                        var xmfzr = res.data[i].xmfzr || 'N/A';
+
+                        tableHtml += '<tr>' +
+                            '<td>' + xm + '</td>' +
+                            '<td>' + sfzh + '</td>' +
+                            '<td>' + qpsj + '</td>' +
+                            '<td>' + dqsj + '</td>' +
+                            '<td>' + xmfzr + '</td>' +
+                            '</tr>';
+                    };
+                    tableHtml += '</tbody></table>';
+                    layer.open({
+                        type: 1,
+                        title: '问题数据', // 弹框标题
+                        content: tableHtml, // 弹框内容为生成的表格 HTML
+                        area: ['1000px', '600px'] // 设置弹框大小
+                    });
+                    table.reload('currentTableId');
+                }
+            },
 
+    });
         // 监听搜索操作
         form.on('submit(data-search-btn)', function (data) {
             // 执行搜索重载
@@ -243,10 +284,8 @@
                         data: JSON.stringify(data),
                         success: function (res) {
                             if (res.code === 0) {
-                                Message.success(1500, res.message, function () {
-                                    // 重载表格
-                                    currTable.reload();
-                                });
+                                Message.success(1500, res.message);
+                                table.reload('currentTableId');
                             } else {
                                 Message.error(res.message, 1000);
                             }
@@ -262,7 +301,7 @@
                 AjaxUtil.get({
                     url:AjaxUtil.ctx +'lsUser/getAll',
                     success: function(res){
-                        table.exportFile('currentTableId',res.data,'xls');
+                        table.exportFile('currentTableId',res.data,'xlsx');
                     },
                     error:function (error) {
                         Message.error(error,2000)
@@ -271,7 +310,7 @@
                 });
 
             }else if (obj.event === 'download'){
-                table.exportFile('currentTableId',' ','xls');
+                window.location.href = 'http://10.208.114.107:8082/202407/Template.xlsx';
             }
         });
 
@@ -312,29 +351,18 @@
                         url: AjaxUtil.ctx + "lsUser/delete/" + data.id,
                         success: function (res) {
                             if (res.code === 0) {
-                                layer.msg('删除成功', {icon: 6}, function () {
-                                    // 表格重载
-                                    table.reload('currentTableId', {
-                                        data: data,  // 更新后的数据源
-                                        page: false, // 不分页处理
-                                        limit: data.length // 限制数据条数，取数据源长度
-                                    }, true);
-                                })
+                                layer.msg(res.message);
+                                table.reload('currentTableId');
                             } else {
-                                layer.msg('删除失败', {icon: 5}, function () {
-                                    // 表格重载
-                                    table.reload('currentTableId', {
-                                        data: data,  // 更新后的数据源
-                                        page: false, // 不分页处理
-                                        limit: data.length // 限制数据条数，取数据源长度
-                                    }, true);
-                                });
+                                layer.msg(res.message);
+                                table.reload('currentTableId');
                             }
                         },
                         error: function (error) {
 
                             layer.alert('服务器睡着了', {icon: 5});
                             console.log(error);
+                            table.reload('currentTableId');
                         }
                     });
                 });
@@ -345,19 +373,6 @@
 
     });
 
-    function updateTable() {
-        // 表格重载
-        table.reload('currentTableId', {
-            data: data,  // 更新后的数据源
-            page: false, // 不分页处理
-            limit: data.length // 限制数据条数，取数据源长度
-        }, true);
-
-    }
-
-    function setUpdateFlag() {
-        updateflag = 1;
-    }
 </script>
 </body>
 </html>

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

@@ -675,8 +675,11 @@
                     return false;
                 }
                 dataTj[0].ysqje = parseFloat($("#sqje").val()) + sqje1;
-                dataTj[0].ybzje = bzjeOne + parseFloat($("#sqje").val());
-                dataTj[1].ysqje = dataTj[1].ysqje - parseFloat($("#sqje").val());
+                // dataTj[0].ybzje = bzjeOne + parseFloat($("#sqje").val());
+                dataTj[0].ybzje = bzjeOne;
+                // dataTj[1].ysqje = dataTj[1].ysqje - parseFloat($("#sqje").val());
+                dataTj[1].ysqje = dataTj[0].ysje * 10000- dataTj[0].ysqje
+
                 if (dataTj[0].ysqje > parseFloat(ysje * 1.2).toFixed(6)) {
                     Message.error("该科目申请的费用总金额，不能超过预算金额的120%!", 2000);
                     return false;