单号生成

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.cas.controller;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -90,7 +91,11 @@ public class CasClientController {
 			JSONObject obj = new JSONObject();
 			List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId());
 			obj.put("departs", departs);
-
+			if(departs.size() > 0){
+				sysUser.setDeptName(departs.stream().map(SysDepart::getDepartName).collect(Collectors.joining(",")));
+			}else{
+				sysUser.setDeptName("无部门");
+			}
 //			if (departs == null || departs.size() == 0) {
 //				obj.put("multi_depart", 0);
 //			} else if (departs.size() == 1) {

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -40,6 +40,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Author scott
@@ -475,6 +476,12 @@ public class LoginController {
 		JSONObject obj = new JSONObject();
 		List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId());
 		obj.put("departs", departs);
+		if(departs.size() > 0){
+			sysUser.setDeptName(departs.stream().map(SysDepart::getDepartName).collect(Collectors.joining(",")));
+		}else{
+			sysUser.setDeptName("无部门");
+		}
+
 //		if (departs == null || departs.size() == 0) {
 //			obj.put("multi_depart", 0);
 //		} else if (departs.size() == 1) {

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -1550,12 +1550,16 @@ public class SysUserController {
         codeVo.setSeqName(name);
         try {
 
-            if(name.equals("accidentCode")){
-                LocalDate with = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth());
-                String nowDate = DateUtils.getDate("yyyy-MM-dd");
-                if(nowDate.equals(with.toString())){
-                    sysUserMapper.updateNextNo(name);
-                }
+            if(name.equals("accidentCode")){ //质量事故单号
+//                LocalDate with = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth());
+//                String nowDate = DateUtils.getDate("yyyy-MM-dd");
+//                if(nowDate.equals(with.toString())){
+//                    sysUserMapper.updateNextNoByNY(name);
+//                }
+                sysUserMapper.updateNextNoByNY(name); //每月清零
+            }
+            if(name.equals("BXDCode")){ //报销单号
+               sysUserMapper.updateNextNoByNYR(name); //每日清零
             }
 
             sysUserMapper.getNextNo(codeVo);
@@ -1571,6 +1575,17 @@ public class SysUserController {
                 }
             }
 
+            if(name.equals("BXDCode")){
+                String nowDate = DateUtils.getDate("yyMMdd");
+                if(codeVo.getSeqNo() < 10){
+                    return "TW-BXD"+nowDate+"-00"+codeVo.getSeqNo();
+                }else if(codeVo.getSeqNo() > 9 && codeVo.getSeqNo() < 100){
+                    return "TW-BXD"+nowDate+"-0"+codeVo.getSeqNo();
+                }else{
+                    return "TW-BXD"+nowDate+"-"+codeVo.getSeqNo();
+                }
+            }
+
             return String.valueOf(codeVo.getSeqNo());
         }catch (Exception e){
             return "";

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java

@@ -179,5 +179,11 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	 * 自动编号初始化
 	 * @param seqName
 	 */
-	int updateNextNo(String seqName);
+	int updateNextNoByNY(String seqName);
+
+	/**
+	 * 自动编号初始化
+	 * @param seqName
+	 */
+	int updateNextNoByNYR(String seqName);
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -234,8 +234,13 @@
 		CALL nextSeqNo(#{seqName,mode=IN},#{seqNo,mode=OUT,jdbcType=BIGINT})
 	</select>
 
-	<update id="updateNextNo">
+	<update id="updateNextNoByNYR">
 		update sys_dict_item set item_value=0 ,update_time = now() where item_text = #{seqName}
 		and (update_time is null or DATE_FORMAT(update_time,'%Y-%m-%d') != DATE_FORMAT(NOW(),'%Y-%m-%d') )
 	</update>
+
+	<update id="updateNextNoByNY">
+		update sys_dict_item set item_value=0 ,update_time = now() where item_text = #{seqName}
+		and (update_time is null or DATE_FORMAT(update_time,'%Y-%m') != DATE_FORMAT(NOW(),'%Y-%m') )
+	</update>
 </mapper>