Merge remote-tracking branch 'origin/master'

lis-interfaceCommon/src/main/resources/mapper/ComSeqMapper.xml

@@ -3,7 +3,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.czlis.interfaceCommon.mapper.ComSeqMapper">
     <select id="getNextSeq" statementType="CALLABLE" parameterType="map">
-        {call getnextseq(
+        {call sp_getnextseq(
                 #{seqid, mode=IN, jdbcType=VARCHAR},
                 #{retcode, mode=OUT, jdbcType=BIGINT}
               )}

liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/XmKnowledgeServiceImpl.java

@@ -2,6 +2,7 @@ package com.czlis.liswork.service.impl.xtwh;
 
 import com.czlis.common.core.domain.Result;
 import com.czlis.common.core.domain.entity.lis.XmKnowledge;
+import com.czlis.interfaceCommon.utils.CommonUtil;
 import com.czlis.liswork.mapper.xtwh.XmKnowledgeMapper;
 import com.czlis.liswork.service.XmKnowledgeService;
 import lombok.extern.slf4j.Slf4j;
@@ -18,7 +19,8 @@ public class XmKnowledgeServiceImpl implements XmKnowledgeService {
 
     @Autowired
     private XmKnowledgeMapper xmKnowledgeMapper;
-
+    @Autowired
+    CommonUtil commonUtil;
 
     @Override
     public List<XmKnowledge> queryData(XmKnowledge xmKnowledge) {
@@ -27,6 +29,9 @@ public class XmKnowledgeServiceImpl implements XmKnowledgeService {
 
     @Override
     public Result add(XmKnowledge xmKnowledge) {
+        //设置种子数据
+        Long zskxmMax = commonUtil.getNextSeq("ZSKXM");
+        xmKnowledge.setXmid(zskxmMax.toString());
         xmKnowledgeMapper.add(xmKnowledge);
         return new Result("0","新增数据成功！");
     }