Merge branch 'dev-lgl'

# Conflicts:
#	src/main/java/com/liang/dao/StaBudgetapprovalDao.java
#	src/main/resources/templates/reimburse/mylist.html

src/main/java/com/liang/KYGKApplication.java

@@ -8,6 +8,7 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.Environment;
 import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.mybatis.spring.annotation.MapperScan;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
@@ -20,6 +21,7 @@ import java.net.UnknownHostException;
 @SpringBootApplication
 @EnableTransactionManagement
 @MapperScan("com.liang.dao")
+@EnableScheduling
 public class KYGKApplication {
     final static Logger logger = LoggerFactory.getLogger(KYGKApplication.class);
 

src/main/java/com/liang/common/config/SFTYProperties.java

@@ -17,5 +17,7 @@ public class SFTYProperties {
 
     private String uploadFilePath;
 
+    private String initPassword;
+
 
 }

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

@@ -358,7 +358,7 @@ public class PrjApproverecordController extends BaseController {
         record1.setId(approverecord.getId());
         record1.setSpcz(approverecord.getSpcz());
         record1.setShr(approverecord.getShr());
-        record1.setShsj(approverecord.getShsj());
+        record1.setShsj(DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN));
         double dmoney = approverecord.getSqje();
 
         if (approverecord.getSpcz().equals("返回修改")) {
@@ -366,8 +366,9 @@ public class PrjApproverecordController extends BaseController {
             record1.setYj(approverecord.getYj());
         } else {
             record1.setSffh(false);//是否返回
-            if (!approverecord.getSpcz().equals("提交审批"))
+            if (!approverecord.getSpcz().equals("提交审批")) {
                 record1.setYj(approverecord.getYj());
+            }
             //是否需要上级审核
             if (approverecord.getZt().equals(PostInfoEnum.YZ.postName() + "审批") || approverecord.getZt().equals(PostInfoEnum.ZGYLD.postName() + "审批") && dmoney < 1000000) {
                 record1.setSfsjsh(false);

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

@@ -1,11 +1,14 @@
 package com.liang.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
+import com.liang.common.enums.PostInfoEnum;
+import com.liang.common.exception.CustomException;
 import com.liang.entity.*;
 import com.liang.service.*;
 import io.swagger.annotations.ApiOperation;
@@ -250,6 +253,64 @@ public class StaBudgetapprovalController extends BaseController {
         }
     }
 
+    @ResponseBody
+    @RequestMapping(value = "/bathUpdate/{xmid}/{sqje}", method = RequestMethod.GET)
+    public Map<Object, Object> bathUpdate(@PathVariable Integer xmid, @PathVariable Double sqje, @RequestParam String spzt) {
+        Map<Object, Object> res = new HashMap<>();
+        //系统当前用户
+        SysUserInfo userInfo = getSysUserInfo();
+        res.put("userInfo", userInfo);
+
+        Map<String, String> paraMap1 = new HashMap<>();
+        paraMap1.put("xmid", xmid.toString());
+        paraMap1.put("zt", spzt);
+        paraMap1.put("wc", "0");
+        List<PrjApproverecord> approveList = prjApproverecordService.getApproveByXmId(paraMap1);
+        if (approveList.size() == 1) {
+            PrjApproverecord approveInfo = approveList.get(0);
+            approveInfo.setSqje(sqje);
+
+            if (spzt.equals(PostInfoEnum.YZ.postName() + "审批") || spzt.equals(PostInfoEnum.ZGYLD.postName() + "审批") && sqje < 1000000) {
+                approveInfo.setSpcz("批量审批");
+                approveInfo.setYj("通过");
+            } else {
+                //岗位
+                Map<String, String> paraMap2 = new HashMap<>();
+                if ((PostInfoEnum.BMZR.postName() + "审批").equals(spzt)) {
+                    paraMap2.put("postName", PostInfoEnum.KJXMGLZZ.postName());
+                } else if ((PostInfoEnum.KJXMGLZZ.postName() + "审批").equals(spzt)) {
+                    paraMap2.put("postName", PostInfoEnum.KJBBMZR.postName());
+                } else if ((PostInfoEnum.KJBBMZR.postName() + "审批").equals(spzt)) {
+                    paraMap2.put("postName", PostInfoEnum.ZGYLD.postName());
+                } else if ((PostInfoEnum.ZGYLD.postName() + "审批").equals(spzt)) {
+                    paraMap2.put("postName", PostInfoEnum.YZ.postName());
+                } else {
+                    paraMap2.put("postName", PostInfoEnum.BMZR.postName());
+                }
+                SysPostInfo postInfo = sysPostInfoService.getSysPostInfo(paraMap2);
+                if (postInfo == null) {
+                    throw new CustomException("没有改岗位");
+                }
+                Map<String, String> paraMap = new HashMap<>();
+                paraMap.put("postId", String.valueOf(postInfo.getPostId()));
+                List<SysUserPost> list = sysUserPostService.getPostUserList(paraMap);
+                approveInfo.setSpcz("批量审批");
+                approveInfo.setSjshgw(postInfo.getPostId());
+                approveInfo.setSjshgwmc(postInfo.getPostName());
+                approveInfo.setSjshr(list.get(0).getUserId());
+                approveInfo.setSjshrxm(list.get(0).getName());
+                approveInfo.setYj("同意");
+            }
+            res.put("approveInfo", approveInfo);
+        } else {
+            throw new CustomException("费用申请批量审批ERROR:数据不匹配,xmid:", xmid);
+        }
+        return res;
+
+    }
+
+    @Resource
+    private SysUserPostService sysUserPostService;
 
     /**
      * 编辑数据（费用申请）
@@ -931,24 +992,6 @@ public class StaBudgetapprovalController extends BaseController {
     public BaseResult updateSpzt(@RequestBody String strData) {
         StaBudgetapproval fysq = JsonTool.parseObject(strData, StaBudgetapproval.class);
         if (fysq.getSpzt().equals("审批结束")) {
-            DateFormat dateFormat = new SimpleDateFormat("yyyy");
-            PrjProject project = prjProjectService.queryById(fysq.getXmid());
-            if (project != null && project.getXmlxmc().indexOf("政府") > 0) {
-                String partBh = "结转类(" + dateFormat.format(new Date()) + ")";
-                String bh = GetApproveRecordBH(partBh);
-                fysq.setBh(bh);
-            } else {
-                if (fysq.getSqje() < 1000000) {
-                    String partBh = "科研类(" + dateFormat.format(new Date()) + ")";
-                    String bh = GetApproveRecordBH(partBh);
-                    fysq.setBh(bh);
-                } else {
-                    String partBh = "大额科研类(" + dateFormat.format(new Date()) + ")";
-                    String bh = GetApproveRecordBH(partBh);
-                    fysq.setBh(bh);
-                }
-            }
-        } else {
             fysq.setBh("");
         }
         int num = staBudgetapprovalService.updateSpzt(fysq);
@@ -1244,13 +1287,14 @@ public class StaBudgetapprovalController extends BaseController {
 
         return resultMap;
     }
+
     @ResponseBody
-    @RequestMapping(value = "/getAll",method = RequestMethod.GET)
-    public BaseResult getAll(){
+    @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);
+        return BaseResult.success(list);
     }
 
 
@@ -1336,24 +1380,6 @@ public class StaBudgetapprovalController extends BaseController {
     public BaseResult doByjConnect(@RequestBody String strData) {
         StaBudgetapproval fysq = JsonTool.parseObject(strData, StaBudgetapproval.class);
         if (fysq.getSpzt().equals("审批结束")) {
-            DateFormat dateFormat = new SimpleDateFormat("yyyy");
-            PrjProject project = prjProjectService.queryById(fysq.getXmid());
-            if (project != null && project.getXmlxmc().indexOf("政府") > 0) {
-                String partBh = "结转类(" + dateFormat.format(new Date()) + ")";
-                String bh = GetApproveRecordBH(partBh);
-                fysq.setBh(bh);
-            } else {
-                if (fysq.getSqje() < 1000000) {
-                    String partBh = "科研类(" + dateFormat.format(new Date()) + ")";
-                    String bh = GetApproveRecordBH(partBh);
-                    fysq.setBh(bh);
-                } else {
-                    String partBh = "大额科研类(" + dateFormat.format(new Date()) + ")";
-                    String bh = GetApproveRecordBH(partBh);
-                    fysq.setBh(bh);
-                }
-            }
-        } else {
             fysq.setBh("");
         }
         int num = staBudgetapprovalService.updateSpzt(fysq);
@@ -1374,10 +1400,10 @@ public class StaBudgetapprovalController extends BaseController {
     public Object getSubNode(@PathVariable Integer nys,
                              @RequestParam Integer page,
                              @RequestParam Integer limit,
-                             @RequestParam(required = false ,value = "mc") String mc
+                             @RequestParam(required = false, value = "mc") String mc
     ) {
         Integer count = prjAnnualbudgetdetailService.getSubNodeCount(nys, page, limit);
-        List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getSubNode(nys, page, limit,mc);
+        List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getSubNode(nys, page, limit, mc);
 
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("code", 0);
@@ -1390,6 +1416,7 @@ public class StaBudgetapprovalController extends BaseController {
 
     /**
      * 未关联项目备用金列表
+     *
      * @return
      */
     @ResponseBody

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

@@ -474,7 +474,7 @@ public class StaPayapprovalController extends BaseController {
             PrjApproverecord approverecord = approveList.get(0);
             if ((PostInfoEnum.KJBBMZR.postName()+"审批").equals(spzt)) {
                 approverecord.setSpcz("批量审批");
-                approverecord.setYj("通过");
+                approverecord.setYj("同意");
             } else {
                 Map<String, String> paraMap2 = new HashMap<>();
                 if ((PostInfoEnum.KJXMGLZZ1.postName() + "审批").equals(spzt)) {
@@ -494,6 +494,7 @@ public class StaPayapprovalController extends BaseController {
                 paraMap.put("postId", String.valueOf(postInfo.getPostId()));
                 List<SysUserPost> list = sysUserPostService.getPostUserList(paraMap);
                 approverecord.setSpcz("批量审批");
+                approverecord.setYj("同意");
                 approverecord.setSjshgw(postInfo.getPostId());
                 approverecord.setSjshgwmc(postInfo.getPostName());
                 approverecord.setSjshr(list.get(0).getUserId());

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

@@ -109,7 +109,7 @@ public class StaReimbursementController extends BaseController {
         //当前用户ID
         model.addAttribute("userId", getSysUserId());
         //年份
-        List<String> yearList = prjAnnualbudgetService.getYearList();
+        List<String> yearList = staReimbursementDao.getYearList();
         model.addAttribute("yearList", yearList);
 
         return "reimburse/list";
@@ -128,9 +128,11 @@ public class StaReimbursementController extends BaseController {
         List<Map<String, String>> approveList = sysDictInfoService.queryByCode("xm_status");
         model.addAttribute("approveList", approveList);
         model.addAttribute("userId", getUserId());
+        //年份
+        List<String> yearList = staReimbursementDao.getYearList();
+        model.addAttribute("yearList", yearList);
         return "reimburse/mylist";
     }
-
     @ResponseBody
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public BaseResult list(@RequestParam("page") Integer pageNum,
@@ -172,6 +174,7 @@ public class StaReimbursementController extends BaseController {
                              @RequestParam(required = false, defaultValue = "", value = "fysqbh") String fysqbh,
                              @RequestParam(required = false, defaultValue = "", value = "spzt") String spzt,
                              @RequestParam(required = false, defaultValue = "", value = "mc") String mc,
+                             @RequestParam(required = false, defaultValue = "", value = "nf") String nf,
                              @RequestParam(required = false, defaultValue = "", value = "bzr") String bzr,
                              @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
                              @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder,
@@ -195,6 +198,7 @@ public class StaReimbursementController extends BaseController {
         paraMap.put("fysqbh", fysqbh);
         paraMap.put("spzt", spzt);
         paraMap.put("mc", mc);
+        paraMap.put("nf", nf);
         paraMap.put("bzr", bzr);
         paraMap.put("xmmc",xmmc);
 

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

@@ -1,11 +1,13 @@
 package com.liang.controller;
 
+import cn.hutool.crypto.digest.MD5;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liang.common.base.BaseResult;
 import com.liang.common.JsonTool;
 import com.liang.common.annotation.LogAround;
 import com.liang.common.base.BaseController;
+import com.liang.common.config.SFTYProperties;
 import com.liang.common.utils.ExcelPoiUtil;
 import com.liang.common.utils.SHA256Utils;
 import com.liang.common.utils.StringUtils;
@@ -22,6 +24,7 @@ import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.bouncycastle.jce.provider.JDKMessageDigest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.ResourceLoader;
@@ -32,6 +35,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import sun.misc.BASE64Encoder;
 
 import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
@@ -41,6 +45,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
 import java.util.*;
 
 /**
@@ -54,7 +59,7 @@ import java.util.*;
 @Api(value = "系统用户管理控制器", tags = "系统用户管理控制器")
 public class SysUserInfoController extends BaseController {
     final static Logger logger = LoggerFactory.getLogger(SysUserInfoController.class);
-
+    final static String salt = "323@#@$1234da";
     /**
      * 服务对象
      */
@@ -173,6 +178,9 @@ public class SysUserInfoController extends BaseController {
         return "userinfo/add";
     }
 
+    @Resource
+    private SFTYProperties sftyProperties;
+
     /**
      * 新增
      *
@@ -185,7 +193,8 @@ public class SysUserInfoController extends BaseController {
     public BaseResult doAdd(SysUserInfo userInfo,
                             @RequestParam(required = false, defaultValue = "", value = "postStr") String postStr) {
         // 再进行加密两次，才是正确密码
-        String password = SHA256Utils.SHA256Encode(userInfo.getPassword());
+        String digestHex = MD5.create().digestHex(salt + sftyProperties.getInitPassword());
+        String password = SHA256Utils.SHA256Encode(digestHex);
         userInfo.setPassword(password);
         userInfo.setCreateUser(getSysUserId());
         int num = sysUserInfoService.insert(userInfo);

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

@@ -211,6 +211,15 @@ public interface StaBudgetapprovalDao {
 
     String getBhById(String id);
 
+    /**
+     * 获取审批结束且科研编号为null的费用申请
+     * @return
+     */
+    List<StaBudgetapproval> listSPJS();
+
+    int updateBatchBh(@Param("entities")List<StaBudgetapproval> staBudgetapprovals);
+
+
     StaBudgetapproval getBayID(Integer ID);
 }
 

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

@@ -130,5 +130,8 @@ public interface StaReimbursementDao {
     int updateBZJE(StaReimbursement staReimbursement);
 
     Integer getRwsIdByBzId(Integer bzID);
+
+    List<String> getYearList();
+
 }
 

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

@@ -159,5 +159,11 @@ public class StaBudgetapproval implements Serializable {
      */
     private String xmndjfysq;
 
+
+    /**
+     * 批量审批新增字段
+     */
+    private String operations;
+
 }
 

src/main/java/com/liang/scheduled/ScheduledEvent.java

@@ -0,0 +1,132 @@
+package com.liang.scheduled;
+
+import cn.hutool.core.collection.CollUtil;
+import com.liang.common.utils.SpringUtil;
+import com.liang.dao.StaBudgetapprovalDao;
+import com.liang.entity.PrjProject;
+import com.liang.entity.StaBudgetapproval;
+import com.liang.service.PrjProjectService;
+import com.liang.service.StaBudgetapprovalService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+
+@Component
+@EnableScheduling // 开启定时任务功能
+@Slf4j
+@RestController
+@RequestMapping("ScheduledEvent")
+public class ScheduledEvent {
+
+    @Resource
+    private StaBudgetapprovalDao staBudgetapprovalDao;
+    @Resource
+    private PrjProjectService prjProjectService;
+    @Resource
+    private StaBudgetapprovalService staBudgetapprovalService;
+
+    /**
+     * 更新审批结束的费用申请的科研编号
+     */
+    @Scheduled(cron = "0 0/1 * * * ? ")
+    public void updateStaBudgetApprovalBh() {
+        log.info("============================开始更新费用申请的科研编号======================");
+        log.info("===================================================================");
+
+        List<StaBudgetapproval> staBudgetapprovals = staBudgetapprovalDao.listSPJS();
+        if (CollUtil.isNotEmpty(staBudgetapprovals)) {
+            log.info("============================待更新费用申请:{}======================", staBudgetapprovals);
+            //设置编号
+            staBudgetapprovals.forEach(item -> {
+                DateFormat dateFormat = new SimpleDateFormat("yyyy");
+                PrjProject project = prjProjectService.queryById(item.getXmid());
+                if (project != null && project.getXmlxmc().indexOf("政府") > 0) {
+                    String partBh = "结转类(" + dateFormat.format(new Date()) + ")";
+                    if (BH.get(partBh) != null) {
+                        BH.put(partBh, (BH.get(partBh) + 1));
+                        item.setBh(partBh + (BH.get(partBh)));
+                    } else {
+                        BH.put(partBh,1001);
+                        item.setBh(partBh + 1001);
+                    }
+                } else {
+                    if (item.getSqje() < 1000000) {
+                        String partBh = "科研类(" + dateFormat.format(new Date()) + ")";
+                        if (BH.get(partBh) != null) {
+                            BH.put(partBh, (BH.get(partBh) + 1));
+                            item.setBh(partBh + (BH.get(partBh)));
+                        } else {
+                            BH.put(partBh,1001);
+                            item.setBh(partBh + 1001);
+                        }
+                    } else {
+                        String partBh = "大额科研类(" + dateFormat.format(new Date()) + ")";
+                        if (BH.get(partBh) != null) {
+                            BH.put(partBh, (BH.get(partBh) + 1));
+                            item.setBh(partBh + (BH.get(partBh)));
+                        } else {
+                            BH.put(partBh,1001);
+                            item.setBh(partBh + 1001);
+                        }
+                    }
+                }
+            });
+            //更新编号
+            try {
+                staBudgetapprovalDao.updateBatchBh(staBudgetapprovals);
+            } catch (Exception e) {
+                log.error("ERROR:更新审批结束的费用申请的科研编号时出错,错误信息:" + e.getMessage());
+            }
+        } else {
+            log.info("============================暂无科研编号需要更新======================");
+        }
+
+    }
+
+    static Map<String, Integer> BH = new HashMap<>();
+
+    static {
+        DateFormat dateFormat = new SimpleDateFormat("yyyy");
+        String partBhZjl = "结转类(" + dateFormat.format(new Date()) + ")";
+        String partBhKyl = "科研类(" + dateFormat.format(new Date()) + ")";
+        String partBhDekyl = "大额科研类(" + dateFormat.format(new Date()) + ")";
+        List<String> bhName = new ArrayList<>();
+        Collections.addAll(bhName, partBhZjl, partBhKyl, partBhDekyl);
+        bhName.forEach(ScheduledEvent::getApproveRecordBH);
+
+    }
+
+    private static void getApproveRecordBH(String partBh) {
+        StaBudgetapprovalService staBudgetapprovalService = SpringUtil.getBean("staBudgetapprovalService");
+        List<StaBudgetapproval> bhList = staBudgetapprovalService.queryByBH(partBh);
+        List<Integer> bh_List = new ArrayList();
+        if (bhList != null && bhList.size() > 0) {
+            for (int i = 0; i < bhList.size(); i++) {
+                int _tmpBh = Integer.parseInt(bhList.get(i).getBh().substring(bhList.get(i).getBh().length() - 4));
+                bh_List.add(_tmpBh);
+            }
+            if (bh_List.size() > 0) {
+                try {
+                    Integer max = Collections.max(bh_List);
+                    BH.put(partBh, max);
+                } catch (Exception er) {
+                    BH.put(partBh, 1001);
+                }
+            } else {
+                BH.put(partBh, 1001);
+            }
+        } else {
+            BH.put(partBh, 1001);
+        }
+    }
+
+}

src/main/resources/application.yml

@@ -103,4 +103,5 @@ redisson:
   timeout: 5000
 sfty:
   #映射服务器本地文件
-  upload-file-path: D:\upload\
+  upload-file-path: D:\upload\
+  init-password: 1234.com

src/main/resources/mapper/StaBudgetapprovalDao.xml

@@ -828,6 +828,15 @@
             #{item}
         </foreach>
     </update>
+    <update id="updateBatchBh">
+        <foreach collection="entities" item="entity" separator=";">
+            update sta_BudgetApproval
+            set
+            BH=#{entity.bh}
+            where
+            id = #{entity.id}
+        </foreach>
+    </update>
 
     <!--批量作废费用申请-->
     <delete id="batchNullify" parameterType="java.util.ArrayList">
@@ -913,6 +922,14 @@
     <select id="getBhById" resultType="java.lang.String">
         SELECT BH FROM sta_BudgetApproval where ID = #{id}
     </select>
+    <select id="listSPJS" resultType="com.liang.entity.StaBudgetapproval">
+        SELECT
+            *
+        from  sta_BudgetApproval sba
+        where
+            sba.SPZT = '审批结束'
+          and sba.BH = ''
+    </select>
 
     <select id="getBayID" resultMap="StaBudgetapprovalMap">
         SELECT * FROM sta_BudgetApproval where ID = #{id}

src/main/resources/mapper/StaReimbursementDao.xml

@@ -228,6 +228,13 @@
                  left join sta_BudgetApproval sb on sb.id = sr.fysq
         where sr.id = #{bzID}
     </select>
+    <select id="getYearList" resultType="java.lang.String">
+        SELECT NF
+        from
+            sta_BudgetApproval
+        group by NF
+        order by nf DESC
+    </select>
 
     <!--批量删除报账-->
     <delete id="batchDelete" parameterType="java.util.ArrayList">

src/main/resources/mapper/SysUserPostDao.xml

@@ -164,9 +164,7 @@
         <if test="userName!= null and userName!= ''">
             and u.name like '%'+#{userName}+'%'
         </if>
-        <if test="postName == '主管院领导'">
-            ORDER BY u.user_id DESC
-        </if>
+            ORDER BY u.order_code DESC
     </select>
 
     <!--用户岗位列表-->

src/main/resources/static/js/lay-module/cascader/cascader.css

@@ -1649,5 +1649,5 @@
 }
 
 ::-webkit-scrollbar {
-    width: 0;
+    /*width: 0;*/
 }

src/main/resources/templates/home/user_password.html

@@ -35,6 +35,7 @@
                 <div class="layui-input-block">
                     <input type="password" name="new_password" lay-verify="required|pass" lay-reqtext="新的密码不能为空"
                            placeholder="请输入新的密码" value="" class="layui-input">
+                    <tip>密码需包含大写字母,小写字母,特殊符号(@、$、!、%、*、?、&),且密码长度不能少于8位,密码范例(Zhangsan@123456)</tip>
                 </div>
             </div>
             <div class="layui-form-item">
@@ -78,6 +79,12 @@
                     layer.msg('两次输入密码不一致！');
                     return false;
                 }
+                const regex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&]).{8,}$/;
+
+                if (!regex.test(new_password)) {
+                    layer.msg('密码强度较弱！')
+                    return false;
+                }
 
                 data.field.old_password = md5.MD5(data.field.old_password);
                 data.field.new_password = md5.MD5(data.field.new_password);

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

@@ -556,7 +556,9 @@
                             //更新审批状态
                             var project = {
                                 "id": xmApprovalBath.xmid,
-                                "spzt": ''
+                                "spzt": '',
+                                "sqje": xmApprovalBath.sqje,
+                                "operations":"bathsp"
                             }
                             if (bathUpdateRes.approveInfo.spcz == '返回修改') {
                                 project.spzt = '未提交(返回)';
@@ -580,7 +582,7 @@
                                 contentType: "application/json",
                                 data: JSON.stringify(project),
                                 success: function (res) {
-                                    return true;
+
                                 },
                                 error: function (error) {
                                 }

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

@@ -28,7 +28,7 @@
                         <div class="layui-input-inline" style="width: 150px">
                             <select name="nf" id="nf" lay-filter="status">
                                 <option value="">全部</option>
-                                <option th:each="item:${yearList}" th:text="${item.nf}" th:value="${item.nf}"></option>
+                                <option th:each="item:${yearList}" th:text="${item}" th:value="${item}"></option>
                             </select>
                         </div>
                         <label class="layui-form-label" style="width: 60px">审批状态</label>

src/main/resources/templates/reimburse/mylist.html

@@ -40,8 +40,22 @@
                         <div class="layui-input-inline"  style="width: 200px">
                             <input type="text" name="mc" autocomplete="off" class="layui-input">
                         </div>
-                        <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 class="layui-inline">
+                            <label class="layui-form-label" style="width: 30px">年份</label>
+                            <div class="layui-input-inline" style="width: 150px">
+                                <select name="nf" id="nf" lay-filter="status">
+                                    <option value="">全部</option>
+                                    <option th:each="item:${yearList}" th:text="${item}"
+                                            th:value="${item}"></option>
+                                </select>
+                            </div>
+                        </div>
+                        <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>
                 </form>
             </div>
@@ -64,9 +78,9 @@
                 <button class="layui-btn layui-btn-sm data-add-btn" lay-event="tjrevokeApprove">
                     <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>撤销审批
                 </button>
-<!--                <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spOption">-->
-<!--                    <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>审核-->
-<!--                </button>-->
+                <!--                <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spOption">-->
+                <!--                    <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>审核-->
+                <!--                </button>-->
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spList">
                     <i class="layui-icon layui-icon-list" style="font-size: 10px;"></i>审批列表
                 </button>
@@ -79,9 +93,9 @@
                 <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nullify">
                     <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>作废
                 </button>
-<!--                <button class="layui-btn layui-btn-sm" lay-event="exportExcel">-->
-<!--                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出列表-->
-<!--                </button>-->
+                <!--                <button class="layui-btn layui-btn-sm" lay-event="exportExcel">-->
+                <!--                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出列表-->
+                <!--                </button>-->
             </div>
         </script>
         <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
@@ -99,8 +113,8 @@
 
     layui.use(['form', 'table', 'tableSelect', 'laydate'], function () {
         var form = layui.form
-            table = layui.table;
-         var userId = $("#userId").val();
+        table = layui.table;
+        var userId = $("#userId").val();
 
         var currTable = table.render({
             elem: '#currentTableId',
@@ -129,7 +143,7 @@
             limit: 10,
             page: true,
             skin: 'grid',
-            parseData: function(res){ //res 即为原始返回的数据
+            parseData: function (res) { //res 即为原始返回的数据
                 return {
                     "code": res.code, //解析接口状态
                     "msg": res.message, //解析提示文本
@@ -137,7 +151,7 @@
                     "data": res.data.rows //解析数据列表
                 };
             },
-            done: function(res, curr, count) { // done为数据渲染完的回调
+            done: function (res, curr, count) { // done为数据渲染完的回调
                 // 测试打印出后端返回的权限列表
                 // let permissionSet = [[${permissionSet}]];
                 // console.log(JSON.stringify(permissionSet));
@@ -160,7 +174,7 @@
         table.on('toolbar(currentTableFilter)', function (obj) {
             if (obj.event == 'edit') {
                 var dataBudget = table.cache["currentTableId"];
-                if(dataBudget.length == 0)
+                if (dataBudget.length == 0)
                     return;
 
                 var checkStatus = table.checkStatus('currentTableId')
@@ -174,7 +188,7 @@
                 } else if (data[0].spzt == "审批结束") {
                     Message.warning("该报账已审批结束，不能修改！", 2000);
                 } else if (data[0].spzt != null && data[0].spzt.indexOf("未提交") < 0) {
-                        Message.warning("该报账审批中，不能修改！", 2000);
+                    Message.warning("该报账审批中，不能修改！", 2000);
                 } else {
                     var index = layer.open({
                         title: '编辑报账',
@@ -183,7 +197,7 @@
                         // maxmin: true,
                         shadeClose: true,
                         area: ['1250px', '750px'],
-                        content: AjaxUtil.ctx + "staReimbursement/forUpdate/" +data[0].id,
+                        content: AjaxUtil.ctx + "staReimbursement/forUpdate/" + data[0].id,
                         end: function () {
                             if (updateflag == 1)
                                 currTable.reload();
@@ -192,10 +206,9 @@
                         }
                     });
                 }
-            }
-            else if (obj.event == 'view') {
+            } else if (obj.event == 'view') {
                 var dataBudget = table.cache["currentTableId"];
-                if(dataBudget.length == 0)
+                if (dataBudget.length == 0)
                     return;
 
                 var checkStatus = table.checkStatus('currentTableId')
@@ -212,28 +225,26 @@
                         // maxmin: true,
                         shadeClose: true,
                         area: ['1250px', '750px'],
-                        content: AjaxUtil.ctx + "staReimbursement/forView/" +data[0].id,
+                        content: AjaxUtil.ctx + "staReimbursement/forView/" + data[0].id,
                         end: function () {
                             layer.close(index);
                         }
                     });
                 }
-            }
-            else if (obj.event === 'delete') {  // 监听删除操作
+            } else if (obj.event === 'delete') {  // 监听删除操作
                 var dataBudget = table.cache["currentTableId"];
-                if(dataBudget.length == 0)
+                if (dataBudget.length == 0)
                     return;
 
                 var checkStatus = table.checkStatus('currentTableId')
-                    ,data = checkStatus.data;
+                    , data = checkStatus.data;
                 if (data == null || data.length === 0) {
                     Message.warning("请选择要删除的报账！", 1000);
                     return;
-                }
-                else {
-                    for(let item of data) {
-                        if(item.spzt != "未提交") {
-                            if(item.spzt == "审批结束")
+                } else {
+                    for (let item of data) {
+                        if (item.spzt != "未提交") {
+                            if (item.spzt == "审批结束")
                                 Message.warning("存在已审批结束的报账，不能直接删除！", 2000);
                             else if (data[0].spzt == "作废")
                                 Message.warning("存在已作废的报账，不能直接删除！", 2000);
@@ -263,8 +274,7 @@
                         }
                     });
                 });
-            }
-            else if (obj.event === 'tjApprove') {
+            } else if (obj.event === 'tjApprove') {
                 var dataBudget = table.cache["currentTableId"];
                 if (dataBudget.length == 0)
                     return;
@@ -288,7 +298,7 @@
                         "zt": data[0].spzt,
                         "bzje": data[0].bzje
                     };
-                    if(data[0].spzt == null) {
+                    if (data[0].spzt == null) {
                         xmApproval.zt = "未提交";
                         data[0].spzt = "未提交";
                     }
@@ -313,8 +323,7 @@
                         }
                     });
                 }
-            }
-            else if (obj.event === 'spOption') {
+            } else if (obj.event === 'spOption') {
                 var dataBudget = table.cache["currentTableId"];
                 if (dataBudget.length == 0)
                     return;
@@ -354,8 +363,7 @@
                         }
                     });
                 }
-            }
-            else if (obj.event === 'spList') {
+            } else if (obj.event === 'spList') {
                 var dataBudget = table.cache["currentTableId"];
                 if (dataBudget.length == 0)
                     return;
@@ -386,8 +394,7 @@
                         }
                     });
                 }
-            }
-            else if (obj.event === 'payRequest') {
+            } else if (obj.event === 'payRequest') {
                 var projects = table.cache["currentTableId"];
                 if (projects.length == 0)
                     return;
@@ -428,8 +435,7 @@
                         }
                     });
                 }
-            }
-            else if (obj.event === 'updateBZJE') {                 //
+            } else if (obj.event === 'updateBZJE') {                 //
                 var projects = table.cache["currentTableId"];
                 if (projects.length == 0)
                     return;
@@ -442,8 +448,7 @@
                     Message.warning("请选择一条记录进行付款修改！", 1500);
                 } else if (data[0].spzt == "作废") {
                     Message.warning("该报账已作废！", 1500);
-                }
-                 else {
+                } else {
                     xmApproval = {
                         "fysq": data[0].fysq,
                         "fysqmc": data[0].fysqmc,
@@ -458,7 +463,7 @@
                         maxmin: true,
                         shadeClose: true,
                         area: ['1000px', '750px'],
-                        content: AjaxUtil.ctx + "staReimbursement/forUpdate/" +data[0].id,
+                        content: AjaxUtil.ctx + "staReimbursement/forUpdate/" + data[0].id,
                         end: function () {
                             if (updateflag == 1)
                                 currTable.reload();
@@ -467,8 +472,7 @@
                         }
                     });
                 }
-            }
-            else if (obj.event === 'nullify') {  // 监听删除操作
+            } else if (obj.event === 'nullify') {  // 监听删除操作
                 var projects = table.cache["currentTableId"];
                 if (projects.length == 0)
                     return;
@@ -511,8 +515,7 @@
                         });
                     });
                 }
-            }
-            else if (obj.event === 'exportExcel') {
+            } else if (obj.event === 'exportExcel') {
                 var projects = table.cache["currentTableId"];
                 if (projects.length == 0)
                     return;
@@ -521,8 +524,7 @@
                 a.href = AjaxUtil.ctx + 'staReimbursement/exportExcel';
                 a.click();
                 a.parentNode.removeChild(a);
-            }
-            else if(obj.event==='tjrevokeApprove'){
+            } else if (obj.event === 'tjrevokeApprove') {
                 var projects = table.cache["currentTableId"];
                 if (projects.length == 0)
                     return;
@@ -535,16 +537,16 @@
                 } else if (data[0].spzt == "审批结束") {
                     Message.warning("该报账已审批结束！", 1500);
                 }
-                //else if (data[0].cjr!= userId) {
+                    //else if (data[0].cjr!= userId) {
 
-                    //Message.error("您不是改报账的创建人！", 1500);}
+                //Message.error("您不是改报账的创建人！", 1500);}
                 else {
                     xmApproval = {
                         "xmid": data[0].id,
                         "xm": data[0].zwmc,
                         "zt": "未提交"
                     };
-                    if(data[0].spzt == null) {
+                    if (data[0].spzt == null) {
                         xmApproval.zt = "未提交";
                         data[0].spzt = "未提交";
                     }
@@ -592,6 +594,7 @@
             });
         });
     });
+
     function getXmApproval() {
         return xmApproval;
     }

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

@@ -513,7 +513,7 @@
                 searchPlaceholder: '搜索费用名称',
                 table: {
                     url: AjaxUtil.ctx + 'staBudgetapproval/getSubNode/' + ysId,
-                    method: 'post',
+                    method: 'get',
                     cols: [
                         [
                             {type: "radio", fixed: 'left'},

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

@@ -89,6 +89,14 @@
                                        readonly>
                             </div>
                         </div>
+                        <div class="layui-form-item layui-inline">
+                            <label class="layui-form-label" style="width: 80px; margin-left: -5px">不含税金额(元)</label>
+                            <div class="layui-input-inline" style="width: 380px">
+                                <input type="number" id="bhsje" name="bhsje" class="layui-input" lay-verify="required"
+                                       lay-reqtext="不含税金额不能为空" autocomplete="off" th:value="${budgetapproval.bhsje}"
+                                       readonly>
+                            </div>
+                        </div>
                         <div class="layui-form-item layui-inline" style="width: 100%; display: none" id="clfDiv">
                             <label class="layui-form-label" style="width: 75px">差旅费</label>
                             <div class="layuimini-container" style="width: 855px; margin-left: 103px">

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

@@ -92,7 +92,7 @@
                         <div class="layui-inline">
                             <label class="layui-form-label required" style="width: 60px">所属部门</label>
                             <div class="layui-input-block" style="width: 200px;left:-20px">
-                                <input type="text" id="ssbmmc" name="ssbmmc" >
+                                <input type="text" id="ssbmmc" name="ssbmmc">
                             </div>
                         </div>
                         <div class="layui-inline" style="left: -10px">
@@ -172,32 +172,32 @@
                 <!--                <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nullify">-->
                 <!--                    <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>作废-->
                 <!--                </button>-->
-<!--                                <button class="layui-btn layui-btn-sm" lay-event="exportExcel">-->
-<!--                                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出-->
-<!--                                </button>-->
-<!--                else if (obj.event === 'exportExcel') {  // 监听查看操作-->
-<!--                var projects = table.cache["currentTableId"];-->
-<!--                if (projects.length == 0)-->
-<!--                return;-->
-
-<!--                var checkStatus = table.checkStatus('currentTableId')-->
-<!--                , data = checkStatus.data;-->
-<!--                if (data == null || data.length === 0) {-->
-<!--                Message.warning("请选择要导出的费用申请！", 1500);-->
-<!--                } else if (data.length > 1) {-->
-<!--                Message.warning("请选择一条记录进行导出！", 1500)-->
-<!--                } else {-->
-<!--                layer.confirm('是否确定导出费用申请——'+data[0].zwmc+'？', {-->
-<!--                btn: ['导出', '取消']-->
-<!--                }, function(index, layero){-->
-<!--                window.location.href=AjaxUtil.ctx + "staBudgetapproval/exportWord/" + data[0].id;-->
-<!--                layer.close(index);-->
-
-<!--                }, function(index){-->
-
-<!--                });-->
-<!--                }-->
-<!--                }-->
+                <!--                                <button class="layui-btn layui-btn-sm" lay-event="exportExcel">-->
+                <!--                                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出-->
+                <!--                                </button>-->
+                <!--                else if (obj.event === 'exportExcel') {  // 监听查看操作-->
+                <!--                var projects = table.cache["currentTableId"];-->
+                <!--                if (projects.length == 0)-->
+                <!--                return;-->
+
+                <!--                var checkStatus = table.checkStatus('currentTableId')-->
+                <!--                , data = checkStatus.data;-->
+                <!--                if (data == null || data.length === 0) {-->
+                <!--                Message.warning("请选择要导出的费用申请！", 1500);-->
+                <!--                } else if (data.length > 1) {-->
+                <!--                Message.warning("请选择一条记录进行导出！", 1500)-->
+                <!--                } else {-->
+                <!--                layer.confirm('是否确定导出费用申请——'+data[0].zwmc+'？', {-->
+                <!--                btn: ['导出', '取消']-->
+                <!--                }, function(index, layero){-->
+                <!--                window.location.href=AjaxUtil.ctx + "staBudgetapproval/exportWord/" + data[0].id;-->
+                <!--                layer.close(index);-->
+
+                <!--                }, function(index){-->
+
+                <!--                });-->
+                <!--                }-->
+                <!--                }-->
             </div>
         </script>
 
@@ -215,14 +215,14 @@
     var updateflag = 0;
     var fyApproval = {};
 
-    layui.use(['form', 'table', 'tableSelect', 'laydate','layCascader'], function () {
+    layui.use(['form', 'table', 'tableSelect', 'laydate', 'layCascader'], function () {
         var form = layui.form,
             tableSelect = layui.tableSelect,
             laydate = layui.laydate,
             table = layui.table;
-            layCascader = layui.layCascader;
+        layCascader = layui.layCascader;
         var userId = $("#userId").val();
-
+        var cascader;
         var sqsj1 = '',
             sqsj2 = '';
         //申请时间
@@ -264,12 +264,11 @@
                     item.label = item.deptName;
                     datalist.push(item);
                 }
-                console.log(datalist)
                 // 扁平数据转树
                 var options = arrayToTree(datalist, "0");
 
                 // 初始化cascader实例
-                var cascader = layCascader({
+                cascader = layCascader({
                     elem: '#ssbmmc',
                     clearable: true,
                     showAllLevels: false, // 配置仅显示最后一级
@@ -284,7 +283,6 @@
                     // 主动关闭面板
                     cascader.close();
                     $("#deptId").val(value);
-                    console.log(node);
                 });
             },
             error: function (error) {
@@ -362,7 +360,7 @@
             limit: 10,
             page: true,
             skin: 'grid',
-            parseData: function (res)   { //res 即为原始返回的数据
+            parseData: function (res) { //res 即为原始返回的数据
                 return {
                     "code": res.code, //解析接口状态
                     "msg": res.message, //解析提示文本
@@ -402,9 +400,10 @@
                 "spzt": '',
                 "sfbz": '',
                 "dkyfzr": '',
-                "sqsj1":'',
-                "sqsj2":''
+                "sqsj1": '',
+                "sqsj2": ''
             });
+            cascader.reload();
             // 执行搜索重载
             currTable.reload({
                 page: {
@@ -840,11 +839,13 @@
     function getXmApproval() {
         return xmApproval;
     }
+
     function arrayToTree(data, firstPid) {
         const result = [];
         getChildren(data, result, firstPid)
         return result;
     }
+
     function getChildren(data, result, parentId) {
         for (const item of data) {
             if (item.parentId === parentId) {

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

@@ -610,7 +610,7 @@
             searchPlaceholder: '搜索费用名称',
             table: {
                 url: AjaxUtil.ctx + 'staBudgetapproval/getSubNode/' + ysId,
-                method: 'post',
+                method: 'get',
                 cols: [
                     [
                         {type: "radio", fixed: 'left'},

src/main/resources/templates/userinfo/add.html

@@ -24,14 +24,6 @@
             <tip>此为用于登陆的账号</tip>
         </div>
     </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label required">密码</label>
-        <div class="layui-input-block">
-            <input type="password" name="password" lay-verify="required" lay-reqtext="密码不能为空" autocomplete="off"
-                   class="layui-input">
-            <tip font-color="red">此为用于登陆的密码</tip>
-        </div>
-    </div>
 
     <div class="layui-form-item">
         <label class="layui-form-label required">姓名</label>