通用数据

service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDao.java

@@ -6,6 +6,7 @@ import com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity;
 import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity;
 
 import java.util.List;
+import java.util.Map;
 
 public interface IComparisonDao extends IBaseDao<ComparisonEntity, String> {
 
@@ -27,11 +28,11 @@ public interface IComparisonDao extends IBaseDao<ComparisonEntity, String> {
      * @Author hecan
      * @Date 2024/5/9 15:11
      * **/
-    List<ComparisonEntity> queryComparisonPage(ComparisonEntity comparison);
+    List<Map<String,Object>> queryComparisonPage(ComparisonEntity comparison);
 
     /**
      *
-     * @content 保存档案对照数据
+     * @content 保存通用数据数据
      * @Param
      * @Return
      * @Author hecan
@@ -51,7 +52,7 @@ public interface IComparisonDao extends IBaseDao<ComparisonEntity, String> {
 
     /**
      *
-     * @content 更新档案对照数据
+     * @content 更新通用数据数据
      * @Param
      * @Return
      * @Author hecan
@@ -61,11 +62,21 @@ public interface IComparisonDao extends IBaseDao<ComparisonEntity, String> {
 
     /**
      *
-     * @content 删除档案对照数据
+     * @content 删除通用数据
      * @Param
      * @Return
      * @Author hecan
      * @Date 2024/5/9 14:09
      * **/
     Integer deleteComparison(ComparisonEntity comparison);
+
+    /**
+     *
+     * @content 查询单据规则
+     * @Param
+     * @Return
+     * @Author hecan
+     * @Date 2024/5/28 14:39
+     * **/
+    ComparisonEntity queryComparisonById(ComparisonEntity comparison);
 }

service/src/main/java/com/hzya/frame/sysnew/comparison/dao/IComparisonDetailsDao.java

@@ -5,12 +5,13 @@ import com.hzya.frame.basedao.dao.IBaseDao;
 import com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity;
 
 import java.util.List;
+import java.util.Map;
 
 public interface IComparisonDetailsDao extends IBaseDao<ComparisonDetailsEntity, String> {
 
    /**
     *
-    * @content 保存档案对照子表数据
+    * @content 保存通用数据子表数据
     * @Param
     * @Return
     * @Author hecan
@@ -20,7 +21,7 @@ public interface IComparisonDetailsDao extends IBaseDao<ComparisonDetailsEntity,
 
     /**
      *
-     * @content 更新档案对照子表数据
+     * @content 更新通用数据子表数据
      * @Param
      * @Return
      * @Author hecan
@@ -30,7 +31,7 @@ public interface IComparisonDetailsDao extends IBaseDao<ComparisonDetailsEntity,
 
     /**
      *
-     * @content 删除档案对照子表数据
+     * @content 删除通用数据子表数据
      * @Param
      * @Return
      * @Author hecan
@@ -46,5 +47,5 @@ public interface IComparisonDetailsDao extends IBaseDao<ComparisonDetailsEntity,
       * @Author hecan
       * @Date 2024/5/9 15:34
       * **/
-     List<ComparisonDetailsEntity> queryComparisonDetailsPage(ComparisonDetailsEntity comparisonDetailsEntity);
+     List<Map<String,Object>> queryComparisonDetailsPage(ComparisonDetailsEntity comparisonDetailsEntity);
 }

service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDaoImpl.java

@@ -7,6 +7,7 @@ import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 @Repository(value = "comparisonDaoImpl")
 public class ComparisonDaoImpl extends MybatisGenericDao<ComparisonEntity, String> implements IComparisonDao {
@@ -19,8 +20,8 @@ public class ComparisonDaoImpl extends MybatisGenericDao<ComparisonEntity, Strin
 
     //分页查询
     @Override
-    public List<ComparisonEntity> queryComparisonPage(ComparisonEntity comparison) {
+    public List<Map<String,Object>> queryComparisonPage(ComparisonEntity comparison) {
-        List<ComparisonEntity> query = super.query(getSqlIdPrifx() + "queryComparisonPage", comparison);
+        List<Map<String,Object>> query =(List<Map<String, Object>>) super.selectList(getSqlIdPrifx() + "queryComparisonPage", comparison);
         return query;
     }
 
@@ -38,17 +39,24 @@ public class ComparisonDaoImpl extends MybatisGenericDao<ComparisonEntity, Strin
         return comparisonEntities.get(0);
     }
 
-    //更新档案对照数据
+    //更新通用数据数据
     @Override
     public Integer updateComparisonByType(ComparisonEntity comparison) {
         int update = super.update(getSqlIdPrifx() + "updateComparisonByType", comparison);
         return update;
     }
 
-    //删除档案对照数据
+    //删除通用数据
     @Override
     public Integer deleteComparison(ComparisonEntity comparison) {
         int delete = super.delete(getSqlIdPrifx() + "deleteComparison", comparison);
         return delete;
     }
+
+    //查询单据规则
+    @Override
+    public ComparisonEntity queryComparisonById(ComparisonEntity comparison) {
+        List<ComparisonEntity> comparisonEntities = super.query(getSqlIdPrifx() + "queryComparisonById", comparison);
+        return comparisonEntities.get(0);
+    }
 }

service/src/main/java/com/hzya/frame/sysnew/comparison/dao/impl/ComparisonDetailsDaoImpl.java

@@ -9,25 +9,26 @@ import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 @Repository(value = "comparisonDetailsDaoImpl")
 public class ComparisonDetailsDaoImpl extends MybatisGenericDao<ComparisonDetailsEntity, String> implements IComparisonDetailsDao {
 
-    //保存档案对照子表数据
+    //保存通用数据子表数据
     @Override
     public ComparisonDetailsEntity saveComparisonDetails(ComparisonDetailsEntity comparisonDetailsEntity) {
         ComparisonDetailsEntity detailsEntity = super.save(getSqlIdPrifx() + "saveComparisonDetails", comparisonDetailsEntity);
         return detailsEntity;
     }
 
-    //更新档案对照子表数据
+    //更新通用数据子表数据
     @Override
     public Integer updateComparisonDetailsByType(ComparisonDetailsEntity comparisonDetailsEntity) {
         int update = super.update(getSqlIdPrifx()+"updateComparisonDetailsByType", comparisonDetailsEntity);
         return update;
     }
 
-    //删除档案对照子表的数据
+    //删除通用数据子表的数据
     @Override
     public Integer deleteComparisonDetails(ComparisonDetailsEntity comparisonDetailsEntity) {
         int delete = super.delete(getSqlIdPrifx() + "deleteComparisonDetails", comparisonDetailsEntity);
@@ -36,8 +37,8 @@ public class ComparisonDetailsDaoImpl extends MybatisGenericDao<ComparisonDetail
 
     //分页查询子表数据
     @Override
-    public List<ComparisonDetailsEntity> queryComparisonDetailsPage(ComparisonDetailsEntity comparisonDetailsEntity) {
+    public List<Map<String,Object>> queryComparisonDetailsPage(ComparisonDetailsEntity comparisonDetailsEntity) {
-        List<ComparisonDetailsEntity> query = super.query(getSqlIdPrifx() + "queryComparisonDetailsPage", comparisonDetailsEntity);
+        List<Map<String,Object>> query =(List<Map<String, Object>>) super.selectList(getSqlIdPrifx() + "queryComparisonDetailsPage", comparisonDetailsEntity);
         return query;
     }
 

service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.java

@@ -9,7 +9,7 @@ import java.util.Map;
 
 /**
  *
- * @content 档案对照明细实体类
+ * @content 通用数据明细实体类
  * @Param
  * @Return
  * @Author hecan
@@ -20,32 +20,7 @@ public class ComparisonDetailsEntity extends BaseEntity {
     private String contrastType;//对照类型
     private String documentRule;//单据规则
     private Long documentRuleNum;//单据规则流水号
-    private String sszz;//所属组织
+
-    private String bz;//备注
-    private String formmainId;//上级id
-    private String taskLinvingId;//集成任务-实例_id
-    private String result;//返回结果
-    private String queryCondition;//原始查询条件
-    private String rootAppPk;//源系统主键
-    private String rootAppBill;//原系统单据
-    private String rootAppNewData;//最新源系统数据详情
-    private String newTransmitInfo;//最新传输信息
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date newPushDate;//最新推送时间
-    private String repairPust;//是否补推(Y是N不是)
-    private String senceId;//场景id
-    private String newState;//最新推送状态
-    private String businessDate;//单据业务日期
-    private String pluginId;//插件id
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date processingTime;//处理时间
-    private String processingRemarks;//处理备注
-    private String processorName;//处理⼈名称
-    private String processor;//处理⼈
-    private String newSystemNumber;//下游系统单号
-    private  String newSystemPrimary;//下游系统主键
 
     private String mdmName;//主数据名称
     private String mdmCode;//主数据编码
@@ -54,9 +29,42 @@ public class ComparisonDetailsEntity extends BaseEntity {
     private String enName;//字段名 英文
     private String chName;// 字段名 中文
     private String filedType;//字段类型 1、BIGINT 2、DECIMAL 3、VARCHAR 4、DATETIME
+    private String formmainId;//上级id
+
+    public String getFormmainId() {
+        return formmainId;
+    }
+
+    public void setFormmainId(String formmainId) {
+        this.formmainId = formmainId;
+    }
 
     private Map<String,Object> mapDetails;
 
+    public String getContrastType() {
+        return contrastType;
+    }
+
+    public void setContrastType(String contrastType) {
+        this.contrastType = contrastType;
+    }
+
+    public String getDocumentRule() {
+        return documentRule;
+    }
+
+    public void setDocumentRule(String documentRule) {
+        this.documentRule = documentRule;
+    }
+
+    public Long getDocumentRuleNum() {
+        return documentRuleNum;
+    }
+
+    public void setDocumentRuleNum(Long documentRuleNum) {
+        this.documentRuleNum = documentRuleNum;
+    }
+
     public String getMdmName() {
         return mdmName;
     }
@@ -120,204 +128,4 @@ public class ComparisonDetailsEntity extends BaseEntity {
     public void setMapDetails(Map<String, Object> mapDetails) {
         this.mapDetails = mapDetails;
     }
-
-    public String getContrastType() {
-        return contrastType;
-    }
-
-    public void setContrastType(String contrastType) {
-        this.contrastType = contrastType;
-    }
-
-    public String getDocumentRule() {
-        return documentRule;
-    }
-
-    public void setDocumentRule(String documentRule) {
-        this.documentRule = documentRule;
-    }
-
-    public Long getDocumentRuleNum() {
-        return documentRuleNum;
-    }
-
-    public void setDocumentRuleNum(Long documentRuleNum) {
-        this.documentRuleNum = documentRuleNum;
-    }
-
-    public String getSszz() {
-        return sszz;
-    }
-
-    public void setSszz(String sszz) {
-        this.sszz = sszz;
-    }
-
-    public String getBz() {
-        return bz;
-    }
-
-    public void setBz(String bz) {
-        this.bz = bz;
-    }
-
-    public String getFormmainId() {
-        return formmainId;
-    }
-
-    public void setFormmainId(String formmainId) {
-        this.formmainId = formmainId;
-    }
-
-    public String getTaskLinvingId() {
-        return taskLinvingId;
-    }
-
-    public void setTaskLinvingId(String taskLinvingId) {
-        this.taskLinvingId = taskLinvingId;
-    }
-
-    public String getResult() {
-        return result;
-    }
-
-    public void setResult(String result) {
-        this.result = result;
-    }
-
-    public String getQueryCondition() {
-        return queryCondition;
-    }
-
-    public void setQueryCondition(String queryCondition) {
-        this.queryCondition = queryCondition;
-    }
-
-    public String getRootAppPk() {
-        return rootAppPk;
-    }
-
-    public void setRootAppPk(String rootAppPk) {
-        this.rootAppPk = rootAppPk;
-    }
-
-    public String getRootAppBill() {
-        return rootAppBill;
-    }
-
-    public void setRootAppBill(String rootAppBill) {
-        this.rootAppBill = rootAppBill;
-    }
-
-    public String getRootAppNewData() {
-        return rootAppNewData;
-    }
-
-    public void setRootAppNewData(String rootAppNewData) {
-        this.rootAppNewData = rootAppNewData;
-    }
-
-    public String getNewTransmitInfo() {
-        return newTransmitInfo;
-    }
-
-    public void setNewTransmitInfo(String newTransmitInfo) {
-        this.newTransmitInfo = newTransmitInfo;
-    }
-
-    public Date getNewPushDate() {
-        return newPushDate;
-    }
-
-    public void setNewPushDate(Date newPushDate) {
-        this.newPushDate = newPushDate;
-    }
-
-    public String getRepairPust() {
-        return repairPust;
-    }
-
-    public void setRepairPust(String repairPust) {
-        this.repairPust = repairPust;
-    }
-
-    public String getSenceId() {
-        return senceId;
-    }
-
-    public void setSenceId(String senceId) {
-        this.senceId = senceId;
-    }
-
-    public String getNewState() {
-        return newState;
-    }
-
-    public void setNewState(String newState) {
-        this.newState = newState;
-    }
-
-    public String getBusinessDate() {
-        return businessDate;
-    }
-
-    public void setBusinessDate(String businessDate) {
-        this.businessDate = businessDate;
-    }
-
-    public String getPluginId() {
-        return pluginId;
-    }
-
-    public void setPluginId(String pluginId) {
-        this.pluginId = pluginId;
-    }
-
-    public Date getProcessingTime() {
-        return processingTime;
-    }
-
-    public void setProcessingTime(Date processingTime) {
-        this.processingTime = processingTime;
-    }
-
-    public String getProcessingRemarks() {
-        return processingRemarks;
-    }
-
-    public void setProcessingRemarks(String processingRemarks) {
-        this.processingRemarks = processingRemarks;
-    }
-
-    public String getProcessorName() {
-        return processorName;
-    }
-
-    public void setProcessorName(String processorName) {
-        this.processorName = processorName;
-    }
-
-    public String getProcessor() {
-        return processor;
-    }
-
-    public void setProcessor(String processor) {
-        this.processor = processor;
-    }
-
-    public String getNewSystemNumber() {
-        return newSystemNumber;
-    }
-
-    public void setNewSystemNumber(String newSystemNumber) {
-        this.newSystemNumber = newSystemNumber;
-    }
-
-    public String getNewSystemPrimary() {
-        return newSystemPrimary;
-    }
-
-    public void setNewSystemPrimary(String newSystemPrimary) {
-        this.newSystemPrimary = newSystemPrimary;
-    }
 }

service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonDetailsEntity.xml

@@ -5,28 +5,7 @@
         <result property="id" column="id" jdbcType="VARCHAR"/>
         <result property="documentRule" column="document_rule" jdbcType="VARCHAR"/>
         <result property="documentRuleNum" column="document_rule_num" jdbcType="VARCHAR"/>
-        <result property="sszz" column="sszz" jdbcType="VARCHAR"/>
-        <result property="bz" column="bz" jdbcType="VARCHAR"/>
         <result property="formmainId" column="formmain_id" jdbcType="VARCHAR"/>
-        <result property="taskLinvingId" column="task_linving_id" jdbcType="VARCHAR"/>
-        <result property="result" column="result" jdbcType="VARCHAR"/>
-        <result property="queryCondition" column="query_condition" jdbcType="VARCHAR"/>
-        <result property="rootAppPk" column="root_app_pk" jdbcType="VARCHAR"/>
-        <result property="rootAppBill" column="root_app_bill" jdbcType="VARCHAR"/>
-        <result property="rootAppNewData" column="root_app_new_data" jdbcType="VARCHAR"/>
-        <result property="newTransmitInfo" column="new_transmit_info" jdbcType="VARCHAR"/>
-        <result property="newPushDate" column="new_push_date" jdbcType="TIMESTAMP"/>
-        <result property="repairPust" column="repair_pust" jdbcType="VARCHAR"/>
-        <result property="senceId" column="sence_id" jdbcType="VARCHAR"/>
-        <result property="newState" column="new_state" jdbcType="VARCHAR"/>
-        <result property="businessDate" column="business_date" jdbcType="VARCHAR"/>
-        <result property="pluginId" column="plugin_id" jdbcType="VARCHAR"/>
-        <result property="processingTime" column="processing_time" jdbcType="TIMESTAMP"/>
-        <result property="processingRemarks" column="processing_remarks" jdbcType="VARCHAR"/>
-        <result property="processorName" column="processor_name" jdbcType="VARCHAR"/>
-        <result property="processor" column="processor" jdbcType="VARCHAR"/>
-        <result property="newSystemNumber" column="new_system_number" jdbcType="VARCHAR"/>
-        <result property="newSystemPrimary" column="new_system_primary" jdbcType="VARCHAR"/>
 
         <result property="sorts" column="sorts" jdbcType="INTEGER"/>
         <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
@@ -38,7 +17,7 @@
         <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
     </resultMap>
 
-    <select id="queryComparisonDetailsPage" resultMap="get-ComparisonDetailsEntity-result"
+    <select id="queryComparisonDetailsPage" resultType="java.util.Map"
             parameterType="com.hzya.frame.sysnew.comparison.entity.ComparisonDetailsEntity">
         select * from ${dbName}
             where formmain_id=#{formmainId} and sts='Y'

service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.java

@@ -1,16 +1,13 @@
 package com.hzya.frame.sysnew.comparison.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hzya.frame.web.entity.BaseEntity;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 /**
  * 
- * @content 档案对照实体类
+ * @content 通用数据实体类
  * @Param 
  * @Return 
  * @Author hecan 
@@ -20,60 +17,6 @@ public class ComparisonEntity extends BaseEntity {
     private String contrastType;//对照类型
     private String documentRule;//单据规则
     private Long documentRuleNum;//单据规则流水号
-    private String ckbm;//仓库编码
-    private String ckmc;//仓库名称
-    private String cklx;//仓库类型
-    private String ckdz;//仓库地址
-    private String fzr;//负责人
-    private String dh;//电话
-    private String ssdd;//所属地点
-    private String bz;//备注
-    private String ssck;//所属仓库
-    private String hwbm;//货位编码
-
-    private String hwmc;//货位名称
-    private String hwrj;//货位容积
-    private String dd;//地点
-    private String sjzz;//上级组织
-    private String zzbm;//组织编码
-    private String zzmc;//组织名称
-    private String fr;//法人
-    private String dz;//地址
-    private String taskCode;//任务编码
-    private String taskName;//任务名称
-    private String taskClasses;//任务分类
-    private String taskCron;//任务策略
-    private String taskTag;//任务标识
-    private String funInfo;//功能介绍/任务描述'
-    private String senceId;//场景id
-    private String remark;//备注
-    private String taskStatus;//任务状态
-    private String serverName;//服务名称
-    private String plug;//插件
-    private String plugId;//插件id
-
-    private String taskLinvingId;//集成任务-实例_id
-    private String result;//返回结果
-    private String queryCondition;//原始查询条件
-    private String rootAppPk;//源系统主键
-    private String rootAppBill;//原系统单据
-    private String rootAppNewData;//最新源系统数据详情
-    private String newTransmitInfo;//最新传输信息
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date newPushDate;//最新推送时间
-    private String repairPust;//是否补推(Y是N不是)
-    private String newState;//最新推送状态
-    private String businessDate;//单据业务日期
-    private String pluginId;//插件id
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date processingTime;//处理时间
-    private String processingRemarks;//处理备注
-    private String processorName;//处理⼈名称
-    private String processor;//处理⼈
-    private String newSystemNumber;//下游系统单号
-    private  String newSystemPrimary;//下游系统主键
 
     private String mdmName;//主数据名称
     private String mdmCode;//主数据编码
@@ -85,10 +28,46 @@ public class ComparisonEntity extends BaseEntity {
 
     private Map<String,Object> map;
     private ComparisonDetailsEntity comparisonDetailsEntity;
-    private String sszz;//所属组织
     private String formmainId;//上级id
 
     private String rulePrefix;//规则前缀 CK-yyyyMMdd-0001中的CK
+    private String ruleMiddle;//规则中间 CK-yyyyMMdd-0001中的yyyyMMdd
+    private String ruleSuffix;//规则后缀 CK-yyyyMMdd-0001中的0001
+
+    private String mId;//mdm_module的id
+    private String dbId;//mdm_module_db的id
+
+    public String getRuleMiddle() {
+        return ruleMiddle;
+    }
+
+    public void setRuleMiddle(String ruleMiddle) {
+        this.ruleMiddle = ruleMiddle;
+    }
+
+    public String getRuleSuffix() {
+        return ruleSuffix;
+    }
+
+    public void setRuleSuffix(String ruleSuffix) {
+        this.ruleSuffix = ruleSuffix;
+    }
+
+    public String getmId() {
+        return mId;
+    }
+
+    public void setmId(String mId) {
+        this.mId = mId;
+    }
+
+    public String getDbId() {
+        return dbId;
+    }
+
+    public void setDbId(String dbId) {
+        this.dbId = dbId;
+    }
 
     private List<ComparisonDetailsEntity> comparisonDetailsEntityList;
 
@@ -100,47 +79,30 @@ public class ComparisonEntity extends BaseEntity {
         this.comparisonDetailsEntityList = comparisonDetailsEntityList;
     }
 
-    public String getRulePrefix() {
+    public String getContrastType() {
-        return rulePrefix;
+        return contrastType;
     }
 
-    public void setRulePrefix(String rulePrefix) {
+    public void setContrastType(String contrastType) {
-        this.rulePrefix = rulePrefix;
+        this.contrastType = contrastType;
     }
 
-    public String getSszz() {
+    public String getDocumentRule() {
-        return sszz;
+        return documentRule;
     }
 
-    public void setSszz(String sszz) {
+    public void setDocumentRule(String documentRule) {
-        this.sszz = sszz;
+        this.documentRule = documentRule;
     }
 
-    public String getFormmainId() {
+    public Long getDocumentRuleNum() {
-        return formmainId;
+        return documentRuleNum;
     }
 
-    public void setFormmainId(String formmainId) {
+    public void setDocumentRuleNum(Long documentRuleNum) {
-        this.formmainId = formmainId;
+        this.documentRuleNum = documentRuleNum;
     }
 
-    public ComparisonDetailsEntity getComparisonDetailsEntity() {
-        return comparisonDetailsEntity;
-    }
-
-    public void setComparisonDetailsEntity(ComparisonDetailsEntity comparisonDetailsEntity) {
-        this.comparisonDetailsEntity = comparisonDetailsEntity;
-    }
-
-    public Map<String, Object> getMap() {
-        return map;
-    }
-
-    public void setMap(Map<String, Object> map) {
-        this.map = map;
-    }
-
-
     public String getMdmName() {
         return mdmName;
     }
@@ -197,411 +159,35 @@ public class ComparisonEntity extends BaseEntity {
         this.filedType = filedType;
     }
 
-    public String getTaskLinvingId() {
+    public Map<String, Object> getMap() {
-        return taskLinvingId;
+        return map;
     }
 
-    public void setTaskLinvingId(String taskLinvingId) {
+    public void setMap(Map<String, Object> map) {
-        this.taskLinvingId = taskLinvingId;
+        this.map = map;
     }
 
-    public String getResult() {
+    public ComparisonDetailsEntity getComparisonDetailsEntity() {
-        return result;
+        return comparisonDetailsEntity;
     }
 
-    public void setResult(String result) {
+    public void setComparisonDetailsEntity(ComparisonDetailsEntity comparisonDetailsEntity) {
-        this.result = result;
+        this.comparisonDetailsEntity = comparisonDetailsEntity;
     }
 
-    public String getQueryCondition() {
+    public String getFormmainId() {
-        return queryCondition;
+        return formmainId;
     }
 
-    public void setQueryCondition(String queryCondition) {
+    public void setFormmainId(String formmainId) {
-        this.queryCondition = queryCondition;
+        this.formmainId = formmainId;
     }
 
-    public String getRootAppPk() {
+    public String getRulePrefix() {
-        return rootAppPk;
+        return rulePrefix;
     }
 
-    public void setRootAppPk(String rootAppPk) {
+    public void setRulePrefix(String rulePrefix) {
-        this.rootAppPk = rootAppPk;
+        this.rulePrefix = rulePrefix;
-    }
-
-    public String getRootAppBill() {
-        return rootAppBill;
-    }
-
-    public void setRootAppBill(String rootAppBill) {
-        this.rootAppBill = rootAppBill;
-    }
-
-    public String getRootAppNewData() {
-        return rootAppNewData;
-    }
-
-    public void setRootAppNewData(String rootAppNewData) {
-        this.rootAppNewData = rootAppNewData;
-    }
-
-    public String getNewTransmitInfo() {
-        return newTransmitInfo;
-    }
-
-    public void setNewTransmitInfo(String newTransmitInfo) {
-        this.newTransmitInfo = newTransmitInfo;
-    }
-
-    public Date getNewPushDate() {
-        return newPushDate;
-    }
-
-    public void setNewPushDate(Date newPushDate) {
-        this.newPushDate = newPushDate;
-    }
-
-    public String getRepairPust() {
-        return repairPust;
-    }
-
-    public void setRepairPust(String repairPust) {
-        this.repairPust = repairPust;
-    }
-
-    public String getNewState() {
-        return newState;
-    }
-
-    public void setNewState(String newState) {
-        this.newState = newState;
-    }
-
-    public String getBusinessDate() {
-        return businessDate;
-    }
-
-    public void setBusinessDate(String businessDate) {
-        this.businessDate = businessDate;
-    }
-
-    public String getPluginId() {
-        return pluginId;
-    }
-
-    public void setPluginId(String pluginId) {
-        this.pluginId = pluginId;
-    }
-
-    public Date getProcessingTime() {
-        return processingTime;
-    }
-
-    public void setProcessingTime(Date processingTime) {
-        this.processingTime = processingTime;
-    }
-
-    public String getProcessingRemarks() {
-        return processingRemarks;
-    }
-
-    public void setProcessingRemarks(String processingRemarks) {
-        this.processingRemarks = processingRemarks;
-    }
-
-    public String getProcessorName() {
-        return processorName;
-    }
-
-    public void setProcessorName(String processorName) {
-        this.processorName = processorName;
-    }
-
-    public String getProcessor() {
-        return processor;
-    }
-
-    public void setProcessor(String processor) {
-        this.processor = processor;
-    }
-
-    public String getNewSystemNumber() {
-        return newSystemNumber;
-    }
-
-    public void setNewSystemNumber(String newSystemNumber) {
-        this.newSystemNumber = newSystemNumber;
-    }
-
-    public String getNewSystemPrimary() {
-        return newSystemPrimary;
-    }
-
-    public void setNewSystemPrimary(String newSystemPrimary) {
-        this.newSystemPrimary = newSystemPrimary;
-    }
-
-    public String getContrastType() {
-        return contrastType;
-    }
-
-    public void setContrastType(String contrastType) {
-        this.contrastType = contrastType;
-    }
-
-    public String getDocumentRule() {
-        return documentRule;
-    }
-
-    public void setDocumentRule(String documentRule) {
-        this.documentRule = documentRule;
-    }
-
-    public Long getDocumentRuleNum() {
-        return documentRuleNum;
-    }
-
-    public void setDocumentRuleNum(Long documentRuleNum) {
-        this.documentRuleNum = documentRuleNum;
-    }
-
-    public String getCkbm() {
-        return ckbm;
-    }
-
-    public void setCkbm(String ckbm) {
-        this.ckbm = ckbm;
-    }
-
-    public String getCkmc() {
-        return ckmc;
-    }
-
-    public void setCkmc(String ckmc) {
-        this.ckmc = ckmc;
-    }
-
-    public String getCklx() {
-        return cklx;
-    }
-
-    public void setCklx(String cklx) {
-        this.cklx = cklx;
-    }
-
-    public String getCkdz() {
-        return ckdz;
-    }
-
-    public void setCkdz(String ckdz) {
-        this.ckdz = ckdz;
-    }
-
-    public String getFzr() {
-        return fzr;
-    }
-
-    public void setFzr(String fzr) {
-        this.fzr = fzr;
-    }
-
-    public String getDh() {
-        return dh;
-    }
-
-    public void setDh(String dh) {
-        this.dh = dh;
-    }
-
-    public String getSsdd() {
-        return ssdd;
-    }
-
-    public void setSsdd(String ssdd) {
-        this.ssdd = ssdd;
-    }
-
-    public String getBz() {
-        return bz;
-    }
-
-    public void setBz(String bz) {
-        this.bz = bz;
-    }
-
-    public String getSsck() {
-        return ssck;
-    }
-
-    public void setSsck(String ssck) {
-        this.ssck = ssck;
-    }
-
-    public String getHwbm() {
-        return hwbm;
-    }
-
-    public void setHwbm(String hwbm) {
-        this.hwbm = hwbm;
-    }
-
-    public String getHwmc() {
-        return hwmc;
-    }
-
-    public void setHwmc(String hwmc) {
-        this.hwmc = hwmc;
-    }
-
-    public String getHwrj() {
-        return hwrj;
-    }
-
-    public void setHwrj(String hwrj) {
-        this.hwrj = hwrj;
-    }
-
-    public String getDd() {
-        return dd;
-    }
-
-    public void setDd(String dd) {
-        this.dd = dd;
-    }
-
-    public String getSjzz() {
-        return sjzz;
-    }
-
-    public void setSjzz(String sjzz) {
-        this.sjzz = sjzz;
-    }
-
-    public String getZzbm() {
-        return zzbm;
-    }
-
-    public void setZzbm(String zzbm) {
-        this.zzbm = zzbm;
-    }
-
-    public String getZzmc() {
-        return zzmc;
-    }
-
-    public void setZzmc(String zzmc) {
-        this.zzmc = zzmc;
-    }
-
-    public String getFr() {
-        return fr;
-    }
-
-    public void setFr(String fr) {
-        this.fr = fr;
-    }
-
-    public String getDz() {
-        return dz;
-    }
-
-    public void setDz(String dz) {
-        this.dz = dz;
-    }
-
-    public String getTaskCode() {
-        return taskCode;
-    }
-
-    public void setTaskCode(String taskCode) {
-        this.taskCode = taskCode;
-    }
-
-    public String getTaskName() {
-        return taskName;
-    }
-
-    public void setTaskName(String taskName) {
-        this.taskName = taskName;
-    }
-
-    public String getTaskClasses() {
-        return taskClasses;
-    }
-
-    public void setTaskClasses(String taskClasses) {
-        this.taskClasses = taskClasses;
-    }
-
-    public String getTaskCron() {
-        return taskCron;
-    }
-
-    public void setTaskCron(String taskCron) {
-        this.taskCron = taskCron;
-    }
-
-    public String getTaskTag() {
-        return taskTag;
-    }
-
-    public void setTaskTag(String taskTag) {
-        this.taskTag = taskTag;
-    }
-
-    public String getFunInfo() {
-        return funInfo;
-    }
-
-    public void setFunInfo(String funInfo) {
-        this.funInfo = funInfo;
-    }
-
-    public String getSenceId() {
-        return senceId;
-    }
-
-    public void setSenceId(String senceId) {
-        this.senceId = senceId;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getTaskStatus() {
-        return taskStatus;
-    }
-
-    public void setTaskStatus(String taskStatus) {
-        this.taskStatus = taskStatus;
-    }
-
-    public String getServerName() {
-        return serverName;
-    }
-
-    public void setServerName(String serverName) {
-        this.serverName = serverName;
-    }
-
-    public String getPlug() {
-        return plug;
-    }
-
-    public void setPlug(String plug) {
-        this.plug = plug;
-    }
-
-    public String getPlugId() {
-        return plugId;
-    }
-
-    public void setPlugId(String plugId) {
-        this.plugId = plugId;
     }
 }

service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.xml

@@ -3,57 +3,6 @@
 <mapper namespace="com.hzya.frame.sysnew.comparison.dao.impl.ComparisonDaoImpl">
     <resultMap id="get-ComparisonEntity-result" type="com.hzya.frame.sysnew.comparison.entity.ComparisonEntity" >
         <result property="id" column="id" jdbcType="VARCHAR"/>
-        <result property="ckbm" column="ckbm" jdbcType="VARCHAR"/>
-        <result property="ckmc" column="ckmc" jdbcType="VARCHAR"/>
-        <result property="cklx" column="cklx" jdbcType="VARCHAR"/>
-        <result property="ckdz" column="ckdz" jdbcType="VARCHAR"/>
-        <result property="fzr" column="fzr" jdbcType="VARCHAR"/>
-        <result property="dh" column="dh" jdbcType="VARCHAR"/>
-        <result property="ssdd" column="ssdd" jdbcType="VARCHAR"/>
-        <result property="bz" column="bz" jdbcType="VARCHAR"/>
-        <result property="ssck" column="ssck" jdbcType="VARCHAR"/>
-        <result property="hwbm" column="hwbm" jdbcType="VARCHAR"/>
-        <result property="hwmc" column="hwmc" jdbcType="VARCHAR"/>
-        <result property="hwrj" column="hwrj" jdbcType="VARCHAR"/>
-        <result property="dd" column="dd" jdbcType="VARCHAR"/>
-        <result property="sjzz" column="sjzz" jdbcType="VARCHAR"/>
-        <result property="zzbm" column="zzbm" jdbcType="VARCHAR"/>
-        <result property="zzmc" column="zzmc" jdbcType="VARCHAR"/>
-        <result property="fr" column="fr" jdbcType="VARCHAR"/>
-        <result property="dz" column="dz" jdbcType="VARCHAR"/>
-        <result property="taskCode" column="task_code" jdbcType="VARCHAR"/>
-        <result property="taskName" column="task_name" jdbcType="VARCHAR"/>
-        <result property="taskClasses" column="task_classes" jdbcType="VARCHAR"/>
-        <result property="taskCron" column="task_cron" jdbcType="VARCHAR"/>
-        <result property="taskTag" column="task_tag" jdbcType="VARCHAR"/>
-        <result property="funInfo" column="fun_info" jdbcType="VARCHAR"/>
-        <result property="senceId" column="sence_id" jdbcType="VARCHAR"/>
-        <result property="remark" column="remark" jdbcType="VARCHAR"/>
-        <result property="taskStatus" column="task_status" jdbcType="VARCHAR"/>
-        <result property="serverName" column="server_name" jdbcType="VARCHAR"/>
-        <result property="plug" column="plug" jdbcType="VARCHAR"/>
-        <result property="plugId" column="plug_id" jdbcType="VARCHAR"/>
-
-        <result property="taskLinvingId" column="task_linving_id" jdbcType="VARCHAR"/>
-        <result property="result" column="result" jdbcType="VARCHAR"/>
-        <result property="queryCondition" column="query_condition" jdbcType="VARCHAR"/>
-        <result property="rootAppPk" column="root_app_pk" jdbcType="VARCHAR"/>
-        <result property="rootAppBill" column="root_app_bill" jdbcType="VARCHAR"/>
-        <result property="rootAppNewData" column="root_app_new_data" jdbcType="VARCHAR"/>
-        <result property="newTransmitInfo" column="new_transmit_info" jdbcType="VARCHAR"/>
-        <result property="newPushDate" column="new_push_date" jdbcType="TIMESTAMP"/>
-        <result property="repairPust" column="repair_pust" jdbcType="VARCHAR"/>
-        <result property="senceId" column="sence_id" jdbcType="VARCHAR"/>
-        <result property="newState" column="new_state" jdbcType="VARCHAR"/>
-        <result property="businessDate" column="business_date" jdbcType="VARCHAR"/>
-        <result property="pluginId" column="plugin_id" jdbcType="VARCHAR"/>
-        <result property="processingTime" column="processing_time" jdbcType="TIMESTAMP"/>
-        <result property="processingRemarks" column="processing_remarks" jdbcType="VARCHAR"/>
-        <result property="processorName" column="processor_name" jdbcType="VARCHAR"/>
-        <result property="processor" column="processor" jdbcType="VARCHAR"/>
-        <result property="newSystemNumber" column="new_system_number" jdbcType="VARCHAR"/>
-        <result property="newSystemPrimary" column="new_system_primary" jdbcType="VARCHAR"/>
-
         <result property="sorts" column="sorts" jdbcType="INTEGER"/>
         <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
         <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
@@ -65,7 +14,7 @@
     </resultMap>
 
     <!--分页查询数据-->
-    <select id="queryComparisonPage" resultMap="get-ComparisonEntity-result"
+    <select id="queryComparisonPage" resultType="java.util.Map"
             parameterType = "java.util.Map">
        select * from ${dbName}
         <trim prefix="where" prefixOverrides="and">
@@ -80,7 +29,8 @@
     <select id="queryComparison" resultMap="get-ComparisonEntity-result"
             parameterType="com.hzya.frame.sysnew.comparison.entity.ComparisonEntity">
         select m.mdm_name as mdmName,m.mdm_code as mdmCode,moddb.db_name as dbName,
-               moddb.db_type as dbType,filed.en_name as enName,filed.ch_name as chName,filed.filed_type as filedType
+               moddb.db_type as dbType,filed.en_name as enName,filed.ch_name as chName,filed.filed_type as filedType,
+               m.id as mId,moddb.id as dbId
         from mdm_module m
                  left join mdm_module_db moddb on m.id=moddb.mdm_id
                  left join mdm_module_db_fileds filed
@@ -88,10 +38,16 @@
         where m.mdm_code= #{mdmCode}
     </select>
 
+    <!--根据mdm_module的id和mdm_module_db的id查询单据规则-->
+    <select id="queryComparisonById" resultMap="get-ComparisonEntity-result">
+            select group_concat(db_value SEPARATOR '') as documentRule from mdm_table_code_rule
+    where mdm_id=#{mId} and sts='Y'
+    </select>
+
     <!--生成单据规则-->
     <select id="queryComparisonRule" resultMap="get-ComparisonEntity-result"
             parameterType="com.hzya.frame.sysnew.comparison.entity.ComparisonEntity">
-        select
+    <!--select
         case  when
                   length(IFNULL(max(right(document_rule,'4')), '0')+1)=2 then
                   concat(#{rulePrefix},'-',REPLACE(LEFT(NOW(),10),'-',''),'-','00',IFNULL(max(right(document_rule,'4')), '0')+1)
@@ -109,8 +65,27 @@
         when length(IFNULL(max(right(document_rule,'4')), '0')+1)=3 then
         concat(#{rulePrefix},'-',REPLACE(LEFT(NOW(),10),'-',''),'-','0',IFNULL(max(right(document_rule,'4')), '0')+1)
         else concat(#{rulePrefix},'-',REPLACE(LEFT(NOW(),10),'-',''),'-','',IFNULL(max(right(document_rule,'4')), '0')+1) end,4) as documentRuleNum
-            from ${dbName} where document_rule like concat(#{rulePrefix},'-',REPLACE(LEFT(NOW(),10),'-',''),'-','%');
+        from ${dbName} where document_rule like concat(#{rulePrefix},'-',REPLACE(LEFT(NOW(),10),'-',''),'-','%');-->
-    </select>
+    select
+        case when length(ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)=1
+                 then concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','000',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)
+             when length(ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)=2
+                 then concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','00',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)
+             when length(ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)=3
+                 then concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','0',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)
+             else concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)
+            end as document_rule,
+        right(
+        case when length(ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)=1
+        then concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','000',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)
+        when length(ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)=2
+        then concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','00',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)
+        when length(ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)=3
+        then concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','0',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)
+        else concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-',ifnull(max(right(document_rule,length(#{ruleSuffix}))),'0')+1)
+        end ,4) as documentRuleNum
+    from  ${dbName} where document_rule like concat(#{rulePrefix},'-',date_format(NOW(),#{ruleMiddle}),'-','%');
+</select>
 
 
   <!--新增档案数据-->
@@ -145,7 +120,7 @@
     <update id="deleteComparison" parameterType = "java.util.Map" >
         update
         ${dbName}
-        set sts= 'N' ,modify_time = now(),modify_user_id = #{modify_user_id}
+        set dataStatus= 'N' ,modify_time = now(),modify_user_id = #{modify_user_id}
         <trim prefix="where" prefixOverrides="and">
             <foreach collection="map.entrySet()" item="value" index="key">
                and ${key} =#{value}

service/src/main/java/com/hzya/frame/sysnew/comparison/service/IComparisonService.java

@@ -9,7 +9,7 @@ public interface IComparisonService extends IBaseService<ComparisonEntity, Strin
     
     /**
      * 
-     * @content 分页查询档案对照数据
+     * @content 分页查询通用数据数据
      * @Param 
      * @Return 
      * @Author hecan 
@@ -19,7 +19,7 @@ public interface IComparisonService extends IBaseService<ComparisonEntity, Strin
 
     /**
      *
-     * @content 新增档案对照数据
+     * @content 新增通用数据数据
      * @Param
      * @Return
      * @Author hecan
@@ -29,7 +29,7 @@ public interface IComparisonService extends IBaseService<ComparisonEntity, Strin
 
     /**
      *
-     * @content 编辑档案对照数据
+     * @content 编辑通用数据数据
      * @Param
      * @Return
      * @Author hecan
@@ -39,7 +39,7 @@ public interface IComparisonService extends IBaseService<ComparisonEntity, Strin
 
     /**
      *
-     * @content 删除档案对照数据
+     * @content 删除通用数据数据
      * @Param
      * @Return
      * @Author hecan

service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java

@@ -34,7 +34,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
         this.dao = dao;
     }
 
-    //分页查询档案对照数据
+    //分页查询通用数据数据
     @Override
     public JsonResultEntity queryEntityPage(JSONObject json) {
         JSONObject jsonObject = json.getJSONObject("jsonStr");
@@ -51,7 +51,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
             comparisonEntities = comparisonDao.queryComparison(comparisonEntity);
         }catch (Exception e){
             logger.info("根据主数据编码查询信息错误:{}",e.getMessage());
-            return BaseResult.getFailureMessageEntity("查询失败",e.getMessage());
+            return BaseResult.getFailureMessageEntity("查询失败");
         }
         Map<String, Object> map = new HashMap<>();//将主表数据存到map中
         if (comparisonEntities != null && comparisonEntities.size() > 0) {
@@ -68,18 +68,18 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
             }
             comparisonEntity.setMap(map);
             try {
-                List<ComparisonEntity> comparisonEntitiePages = comparisonDao.queryComparisonPage(comparisonEntity);
+                List<Map<String,Object>> comparisonEntitiePages = comparisonDao.queryComparisonPage(comparisonEntity);
                 PageInfo pageInfo = new PageInfo(comparisonEntitiePages);
                 return BaseResult.getSuccessMessageEntity("查询成功", pageInfo);
             } catch (Exception e) {
-                logger.info("查询档案对照错误:{}", e.getMessage());
+                logger.info("查询通用数据错误:{}", e.getMessage());
-                return BaseResult.getFailureMessageEntity("查询失败", e.getMessage());
+                return BaseResult.getFailureMessageEntity("查询失败");
             }
         }
         return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数");
     }
 
-    //新增档案对照数据
+    //新增通用数据数据
     @Override
     public JsonResultEntity saveEntity(JSONObject json) {
         JSONObject jsonObject = json.getJSONObject("jsonStr");
@@ -89,9 +89,9 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
         if (!checkStr(jsonObject.getString("mdmCode"))) {
             return BaseResult.getFailureMessageEntity("主数据编码为空");
         }
-        if (!checkStr(jsonObject.getString("rulePrefix"))) {
+        /*if (!checkStr(jsonObject.getString("rulePrefix"))) {
             return BaseResult.getFailureMessageEntity("规则为空");
-        }
+        }*/
         ComparisonEntity comparisonEntity = jsonObject.toJavaObject(ComparisonEntity.class);
         ComparisonDetailsEntity comparisonDetailsEntity=new ComparisonDetailsEntity();
             List<ComparisonEntity> comparisonEntities=new ArrayList<>();
@@ -100,7 +100,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
                 comparisonEntities = comparisonDao.queryComparison(comparisonEntity);
             }catch (Exception e){
                 logger.info("根据主数据编码查询信息错误:{}",e.getMessage());
-                return BaseResult.getFailureMessageEntity("保存失败",e.getMessage());
+                return BaseResult.getFailureMessageEntity("保存失败");
             }
             String main = jsonObject.getString("main");//获取主表数据
             JSONArray jsonArray = jsonObject.getJSONArray("details");//获取子表数据
@@ -114,10 +114,13 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
                         for (String key : jsonObjectMain.keySet()) {
                             if (entity.getDbType().equals("1")) {
                                 comparisonEntity.setDbName(entity.getDbName());
+                                //如果表中得字段与输入得字段相等，则存起来
+                                if(entity.getEnName().equals(key)){
                                     map.put(key, jsonObjectMain.getString(key));
                                 }
                             }
                         }
+                    }
                     if (jsonArray != null && jsonArray.size() > 0) {
                         for (Object object : jsonArray) {
                             JSONObject jsonObjectDetails = (JSONObject) JSON.toJSON(object);
@@ -126,12 +129,14 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
                                 for (String key : jsonObjectDetails.keySet()) {
                                     if (entity.getDbType().equals("2")) {
                                         comparisonDetailsEntity.setDbName(entity.getDbName());
+                                        if(entity.getEnName().equals(key)){
                                             mapDetails.put(key, jsonObjectDetails.getString(key));
                                         }
                                     }
                                 }
                             }
                         }
+                    }
                     String uuid = UUIDUtils.getUUID();
                     map.put("id", uuid);
                     map.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443");
@@ -140,16 +145,38 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
                     map.put("create_time", new Date());
                     map.put("modify_time", new Date());
                     map.put("sts", "Y");
-                    comparisonEntity.setMap(map);
+                    //查询单据规则
-                    //生成单据规则
-                    comparisonEntity.setRulePrefix(jsonObject.getString("rulePrefix"));
                     try {
-                        ComparisonEntity comparisonEntityRule = comparisonDao.queryComparisonRule(comparisonEntity);
+                        ComparisonEntity comparisonEntityRule = comparisonEntities.get(0);
+                        comparisonEntityRule= comparisonDao.queryComparisonById(comparisonEntityRule);
+                        String documentRule = comparisonEntityRule.getDocumentRule();
+                        logger.info("通用数据保存接口中根据mId查询出来的单据规则为:{}",documentRule);
+                        if(documentRule !=null){
+                               //获取规则前缀 CK
+                            String rulePrefix=documentRule.substring(0,documentRule.indexOf("-"));
+                            //获取规则中间日期 yyyy-MM-dd
+                            String ruleDate = documentRule.substring(documentRule.indexOf("-") + 1, documentRule.lastIndexOf("-"));
+                            String ruleMiddle = getRuleDate(ruleDate);
+                            //获取规则后缀
+                           String ruleSuffix= documentRule.substring(documentRule.lastIndexOf("-")+1);
+                            //生成单据规则
+                            comparisonEntity.setRulePrefix(rulePrefix);
+                            comparisonEntity.setRuleMiddle(ruleMiddle);
+                            comparisonEntity.setRuleSuffix(ruleSuffix);
+                            try {
+                                //新生成单据规则保存到数据库
+                                comparisonEntityRule = comparisonDao.queryComparisonRule(comparisonEntity);
                                 map.put("document_rule", comparisonEntityRule.getDocumentRule());//单据规则
                                 map.put("document_rule_num", comparisonEntityRule.getDocumentRuleNum());//单据规则流水号
+                                comparisonEntity.setMap(map);
                             } catch (Exception e) {
-                        logger.info("保存档案对照时候生成单据规则错误:{}", e.getMessage());
+                                logger.info("保存通用数据时候生成单据规则错误:{}", e.getMessage());
-                        return BaseResult.getFailureMessageEntity("保存失败", e.getMessage());
+                                return BaseResult.getFailureMessageEntity("保存失败");
+                            }
+                        }
+                    }catch (Exception e){
+                        logger.info("通用数据保存接口中查询单据规则错误:{}",e.getMessage());
+                        return BaseResult.getFailureMessageEntity("保存失败");
                     }
                     try {
                         //保存主表数据
@@ -170,15 +197,15 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
                         }
                         return BaseResult.getSuccessMessageEntity("保存成功", comparisonEntityOne);
                     } catch (Exception e) {
-                        logger.info("保存档案对照时候错误:{}", e.getMessage());
+                        logger.info("保存通用数据时候错误:{}", e.getMessage());
-                        return BaseResult.getFailureMessageEntity("保存失败", e.getMessage());
+                        return BaseResult.getFailureMessageEntity("保存失败");
                     }
                 }
             }
         return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数");
     }
 
-    //更新档案对照数据
+    //更新通用数据数据
     @Override
     public JsonResultEntity updateEntity(JSONObject json) {
         JSONObject jsonObject = json.getJSONObject("jsonStr");
@@ -201,7 +228,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
            comparisonEntities = comparisonDao.queryComparison(comparisonEntity);
         }catch (Exception e){
             logger.info("根据主数据编码查询信息错误:{}",e.getMessage());
-            return BaseResult.getFailureMessageEntity("更新失败",e.getMessage());
+            return BaseResult.getFailureMessageEntity("更新失败");
         }
         Map<String,Object> map=new HashMap<>();//将主表数据存到map中
         Map<String,Object> mapDetails=new HashMap<>();//将子表数据存到map中
@@ -211,10 +238,12 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
                 for (String key : jsonObjectMain.keySet()) {
                     if (entity.getDbType().equals("1")) {
                         comparisonEntity.setDbName(entity.getDbName());
+                        if(entity.getEnName().equals(key)){
                             map.put(key, jsonObjectMain.getString(key));
                         }
                     }
                 }
+            }
             if (jsonArray != null && jsonArray.size() > 0) {
                 for (Object object : jsonArray) {
                     JSONObject jsonObjectDetails = (JSONObject) JSON.toJSON(object);
@@ -223,12 +252,14 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
                         for (String key : jsonObjectDetails.keySet()) {
                             if (entity.getDbType().equals("2")) {
                                 comparisonDetailsEntity.setDbName(entity.getDbName());
+                                if(entity.getEnName().equals(key)){
                                     mapDetails.put(key, jsonObjectDetails.getString(key));
                                 }
                             }
                         }
                     }
                 }
+            }
             map.put("create_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443");
             map.put("modify_user_id", "c796fd9ba4c9f5ff3cc2fa41a040e443");
             map.put("org_id", "0");
@@ -243,7 +274,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
             map.put("document_rule",comparisonEntityRule.getDocumentRule());//单据规则
             map.put("document_rule_num",comparisonEntityRule.getDocumentRuleNum());//单据规则流水号
         }catch (Exception e){
-            logger.info("更新档案对照时候生成单据规则错误:{}",e.getMessage());
+            logger.info("更新通用数据时候生成单据规则错误:{}",e.getMessage());
             return BaseResult.getFailureMessageEntity("更新失败",e.getMessage());
         }*/
             try {
@@ -260,20 +291,20 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
                         comparisonDetailsEntity.setFormmainId(jsonObjectMain.getString("id"));
                         comparisonDetailsEntity.setMapDetails(mapDetails);
                         comparisonDetailsDao.updateComparisonDetailsByType(comparisonDetailsEntity);
-                        return BaseResult.getSuccessMessageEntity("更新成功", integer);
                     }
+                    return BaseResult.getSuccessMessageEntity("更新成功", integer);
                 }else{
-                    return BaseResult.getFailureMessageEntity("更新失败", "请查看id是否在表中存在");
+                    return BaseResult.getFailureMessageEntity("更新失败");
                 }
             } catch (Exception e) {
-                logger.info("更新档案对照时候错误:{}", e.getMessage());
+                logger.info("更新通用数据时候错误:{}", e.getMessage());
-                return BaseResult.getFailureMessageEntity("更新失败", e.getMessage());
+                return BaseResult.getFailureMessageEntity("更新失败");
             }
         }
         return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数");
     }
 
-    //删除当初对照数据
+    //删除通用数据
     @Override
     public JsonResultEntity deleteEntity(JSONObject json) {
         JSONObject jsonObject = json.getJSONObject("jsonStr");
@@ -295,7 +326,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
             comparisonEntities = comparisonDao.queryComparison(comparisonEntity);
         }catch (Exception e){
             logger.info("根据主数据编码查询信息错误:{}",e.getMessage());
-            return BaseResult.getFailureMessageEntity("删除失败",e.getMessage());
+            return BaseResult.getFailureMessageEntity("删除失败");
         }
         Map<String,Object> map=new HashMap<>();
         if(comparisonEntities !=null && comparisonEntities.size()>0) {
@@ -304,8 +335,10 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
                 for (String key : jsonObjectMain.keySet()) {
                     if (entity.getDbType().equals("1")) {
                         comparisonEntity.setDbName(entity.getDbName());
+                        if(entity.getEnName().equals(key)){
                             map.put(key, jsonObjectMain.getString(key));
                         }
+                    }
                     if(entity.getDbType().equals("2")){
                         comparisonDetailsEntity.setDbName(entity.getDbName());
                     }
@@ -317,18 +350,38 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
             try {
                 Integer integer = comparisonDao.deleteComparison(comparisonEntity);
                 if(integer>0){
+                    if(comparisonDetailsEntity.getDbName()!=null){
                         comparisonDetailsEntity.setFormmainId(jsonObjectMain.getString("id"));
                         comparisonDetailsEntity.setModify_user_id("c796fd9ba4c9f5ff3cc2fa41a040e443");
                         comparisonDetailsDao.deleteComparisonDetails(comparisonDetailsEntity);
+                    }
                      return BaseResult.getSuccessMessageEntity("删除成功",integer);
                 }else{
                     return BaseResult.getFailureMessageEntity("删除失败","请查看id是否在表中存在");
                 }
             }catch (Exception e){
-                logger.info("删除档案对照数据错误:{}",e.getMessage());
+                logger.info("删除通用数据数据错误:{}",e.getMessage());
-                return BaseResult.getFailureMessageEntity("删除失败",e.getMessage());
+                return BaseResult.getFailureMessageEntity("删除失败");
             }
         }
         return BaseResult.getFailureMessageEntity("查询失败","请检查传递参数");
     }
+
+    //根据不同的日期格式，返回不同的值
+    private String getRuleDate(String str){
+        switch (str){
+            case "yyyy-MM-dd":
+                return "%Y-%m-%d";
+            case "yyyyMMdd":
+                return "%Y%m%d";
+            case "yyyy-MM-dd HH:mm:ss":
+                return "Y-%m-%d %H:%i:%s";
+            case "yyyyMMddHHmmss":
+                return "%Y%m%d%H%i%s";
+            case "yyyyMMddHHmmssSSS":
+                return "%Y%m%d%H%i%s%f";
+            default:
+                return null;
+        }
+    }
 }