Browse Source

报工序号bug修改,依次根据现有的序号进行报工

zhangy 2 years ago
parent
commit
206f6028c6

+ 2 - 3
src/main/java/com/steerinfo/ems/tsubmitted/controller/TSubmittedController.java

@@ -80,7 +80,7 @@ public class TSubmittedController extends BaseRESTfulController {
         PageList<TSubmitted> list = tSubmittedService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }
-    
+
     @ApiOperation(value="创建", notes="根据TSubmitted对象创建")
     @ApiImplicitParam(name = "tSubmitted", value = "详细实体tSubmitted", required = true, dataType = "TSubmitted")
     //@RequiresPermissions("tsubmitted:create")
@@ -168,8 +168,7 @@ public class TSubmittedController extends BaseRESTfulController {
         String Signtime = model.getSigntime();
 
         //将转换为字符串的日期进行截取,截取出月和日
-        String mouth = Signtime.substring(5, 7);
-        Integer maxid = tSubmittedService.MaxID(mouth);
+        Integer maxid = tSubmittedService.MaxID(model.getDeclareid());
         model.setMaxid(new BigDecimal(maxid));
 
         String datetime = DateUtils.getCurrentTime("yyyy-MM-dd");

+ 2 - 2
src/main/java/com/steerinfo/ems/tsubmitted/mapper/TSubmittedMapper.java

@@ -8,5 +8,5 @@ import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface TSubmittedMapper extends IBaseMapper<TSubmitted, String> {
-    Integer selectMaxId(@Param(value = "signtime") String mouth);
-}
+    String selectMaxId(@Param(value = "signtime") String mouth);
+}

+ 2 - 2
src/main/java/com/steerinfo/ems/tsubmitted/mapper/TSubmittedMapper.xml

@@ -449,7 +449,7 @@
   </delete>
   <!-- 友情提示!!!-->
   <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-  <select id="selectMaxId" resultType="java.lang.Integer" >
-    SELECT MAX(MAXID) FROM T_SUBMITTED where SIGNTIME LIKE '%${signtime}%'
+  <select id="selectMaxId" resultType="java.lang.String" >
+    SELECT MAX(construid) FROM T_SUBMITTED where construid LIKE '%${signtime}%'
   </select>
 </mapper>

+ 2 - 1
src/main/java/com/steerinfo/ems/tsubmitted/service/impl/TSubmittedServiceImpl.java

@@ -36,7 +36,8 @@ public class TSubmittedServiceImpl extends BaseServiceImpl<TSubmitted, String> i
 
     @Override
     public Integer MaxID(String mouth) {
-        Integer maxId = tSubmittedMapper.selectMaxId(mouth);
+        String max = tSubmittedMapper.selectMaxId(mouth);
+        Integer maxId = max!=null && !"".equals(max) ? Integer.parseInt(max.substring(17)) :0;
         if (maxId == null || maxId == 0) {
             maxId = 1;
         } else {