diff --git a/baseServiceJava/src/main/java/com/dsideal/baseService/Verification/model/VerificationModel.java b/baseServiceJava/src/main/java/com/dsideal/baseService/Verification/model/VerificationModel.java index eec6f1a..41cf647 100644 --- a/baseServiceJava/src/main/java/com/dsideal/baseService/Verification/model/VerificationModel.java +++ b/baseServiceJava/src/main/java/com/dsideal/baseService/Verification/model/VerificationModel.java @@ -99,47 +99,45 @@ public class VerificationModel { */ public int insertVerificationRecord(int module_id, int business_id) { //(1)检查这个模块中的此业务ID是否存在,如果不存在,则全新创建,如果存在,则添加下一条 - String sql = "select ifnull(max(step_id),0)as step_id,verification_status as verificationStatus from t_verification_record where module_id=? and business_id=? order by record_id desc"; + String sql = "select ifnull(max(step_id),0) as step_id,ifnull(verification_status,0) as verificationStatus from t_verification_record where module_id=? and business_id=? order by record_id desc"; List list = Db.find(sql, module_id, business_id); - String verificationSql = "select verification_status as verificationStatus from t_verification_record where module_id=? and business_id=? order by record_id desc"; - List verificationList = Db.find(verificationSql, module_id, business_id); - if (list.size() > 0) { - int step_id = list.get(0).getInt("step_id"); - if (verificationList.size() > 0) { - int verificationStatus = verificationList.get(0).getInt("verificationStatus"); - //4:退回修改 - if (verificationStatus != 4) { - if (step_id == 0) { - //开始第一步的step_id - step_id = getFirstStepId(module_id); - } else { - //获取下一步的step_id - step_id = getNextStepId(module_id); - } - } + + //如果存在旧的,表示是被拒绝后,重新创建一条审核记录 + int step_id = list.get(0).getInt("step_id"); + int verification_status = list.get(0).getInt("verification_status"); + + //TODO + //0 表示没有找到数据,是全新的 + if (verification_status > 0 && verification_status != 4) { + //4:退回修改 + //没有找到的话,就是全新的! + if (step_id == 0) { + //开始第一步的step_id + step_id = getFirstStepId(module_id); } else { - if (step_id == 0) { - //开始第一步的step_id - step_id = getFirstStepId(module_id); - } else { - //获取下一步的step_id - step_id = getNextStepId(module_id); - } + //获取下一步的step_id + step_id = getNextStepId(module_id); } - //(2)构建实体,准备增加 - Record record = new Record(); - record.set("step_id", step_id); - record.set("module_id", module_id); - record.set("business_id", business_id); - record.set("create_time", DateTime.now()); - record.set("verification_status", 2);//待审核 - //(3)增加记录 - Db.save("t_verification_record", "record_id", record); - //返回新生成的ID - return record.getInt("record_id"); } else { - return -1; + if (step_id == 0) { + //开始第一步的step_id + step_id = getFirstStepId(module_id); + } else { + //获取下一步的step_id + step_id = getNextStepId(module_id); + } } + //(2)构建实体,准备增加 + Record record = new Record(); + record.set("step_id", step_id); + record.set("module_id", module_id); + record.set("business_id", business_id); + record.set("create_time", DateTime.now()); + record.set("verification_status", 2);//待审核 + //(3)增加记录 + Db.save("t_verification_record", "record_id", record); + //返回新生成的ID + return record.getInt("record_id"); } /** @@ -193,11 +191,11 @@ public class VerificationModel { * @param limit * @return */ - public Page getVerificationList(int module_id, int verification_status,String identity_id, int page, int limit) { + public Page getVerificationList(int module_id, int verification_status, String identity_id, int page, int limit) { Kv kv = Kv.create(); kv = kv.set("module_id", module_id).set("identity_id", identity_id); - if (verification_status >0) { + if (verification_status > 0) { kv = kv.set("verification_status", verification_status); } SqlPara sp = Db.getSqlPara("Verification.getVerifcationList", kv);