Просмотр исходного кода

需求优化:所有编号增加一项月份,例:JY-YY-2020-03-01

user5 5 лет назад
Родитель
Сommit
18eca536be

+ 9 - 1
src/main/java/com/jeeplus/modules/serialnum/entity/SerialNumTpl.java

@@ -6,7 +6,6 @@ package com.jeeplus.modules.serialnum.entity;
 
 import com.jeeplus.common.persistence.DataEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
-import com.jeeplus.modules.sys.entity.Company;
 import com.jeeplus.modules.sys.entity.Office;
 import org.hibernate.validator.constraints.NotBlank;
 
@@ -31,6 +30,7 @@ public class SerialNumTpl extends DataEntity<SerialNumTpl> {
     @NotBlank(message = "模板名称不能为空")
 	private String tplName; //模板名称
 	private String yearBuilt; //当前年份
+	private String monthBuilt; //当前月份
 	private String serialTplEx; //模板示例
     private Integer OldSerialNum;
 
@@ -116,4 +116,12 @@ public class SerialNumTpl extends DataEntity<SerialNumTpl> {
     public void setOldSerialNum(Integer oldSerialNum) {
         OldSerialNum = oldSerialNum;
     }
+
+	public String getMonthBuilt() {
+		return monthBuilt;
+	}
+
+	public void setMonthBuilt(String monthBuilt) {
+		this.monthBuilt = monthBuilt;
+	}
 }

+ 16 - 11
src/main/java/com/jeeplus/modules/serialnum/service/SerialNumTplService.java

@@ -3,16 +3,13 @@
  */
 package com.jeeplus.modules.serialnum.service;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
+import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.IdGen;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.modules.serialnum.dao.SerialNumTplDao;
+import com.jeeplus.modules.serialnum.entity.SerialNumTpl;
 import com.jeeplus.modules.serialnum.exception.SerialGenException;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
@@ -23,10 +20,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.jeeplus.common.persistence.Page;
-import com.jeeplus.common.service.CrudService;
-import com.jeeplus.modules.serialnum.entity.SerialNumTpl;
-import com.jeeplus.modules.serialnum.dao.SerialNumTplDao;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 编号模板Service
@@ -137,6 +134,14 @@ public class SerialNumTplService extends CrudService<SerialNumTplDao, SerialNumT
             String branchShortname = UserUtils.getSysParam("branch_shortname", UserUtils.getUser());
             map.put("brspnm", StringUtils.isBlank(branchShortname)?"":branchShortname);
 			map.put("year",year);
+			Integer month = new Date().getMonth()+1;
+			String monthStr = null;
+			if (month<10){
+                monthStr = "0"+month;
+            }else{
+                monthStr = month.toString();
+            }
+			map.put("month",monthStr);
 			map.put("serialNum",sb.toString());
 			String serNum = StringUtils.renderString(serialTpl, map);
 			return serNum;

+ 4 - 0
src/main/resources/mappings/modules/serialnum/SerialNumTplDao.xml

@@ -11,6 +11,7 @@
 		a.company_id AS "company.id",
 		a.biz_code AS "bizCode",
 		a.year_built AS "yearBuilt",
+		a.month_built AS "monthBuilt",
 		a.serial_num AS "serialNum",
 		a.serial_tpl AS "serialTpl",
 		a.serial_num_len AS "serialNumLen",
@@ -89,6 +90,7 @@
 			company_id,
 			biz_code,
 			year_built,
+			month_built,
 			serial_num,
 			serial_tpl,
 			serial_num_len,
@@ -103,6 +105,7 @@
 			#{company.id},
 			#{bizCode},
 			#{yearBuilt},
+			#{monthBuilt},
 			#{serialNum},
 			#{serialTpl},
 			#{serialNumLen},
@@ -118,6 +121,7 @@
 			company_id = #{company.id},
 			biz_code = #{bizCode},
 			year_built = #{yearBuilt},
+			month_built = #{monthBuilt},
 			serial_num = #{serialNum},
 			serial_tpl = #{serialTpl},
 			serial_num_len = #{serialNumLen},

+ 4 - 4
src/main/webapp/webpage/modules/serialnum/serialNumTplForm.jsp

@@ -245,11 +245,11 @@
 								}
                                 case "9": {
                                     $(valueId).val("{month}");
-                                    var mohtn = new Date().getMonth()+1;
-                                    if (mohtn<10){
-                                        mohtn = "0"+mohtn;
+                                    var month = new Date().getMonth()+1;
+                                    if (month<10){
+                                        month = "0"+month;
 									}
-                                    $(exId).val(mohtn);
+                                    $(exId).val(month);
                                     break;
                                 }
 							}