Commit e7fbf13b authored by 廖旭伟's avatar 廖旭伟

bug修改

parent c7893bcc
...@@ -17,6 +17,7 @@ import com.deepoove.poi.util.RegexUtils; ...@@ -17,6 +17,7 @@ import com.deepoove.poi.util.RegexUtils;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.framework.util.DateUtils;
import com.mortals.xhx.base.system.upload.service.UploadService; import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.base.system.user.model.UserEntity; import com.mortals.xhx.base.system.user.model.UserEntity;
import com.mortals.xhx.base.system.user.service.UserService; import com.mortals.xhx.base.system.user.service.UserService;
...@@ -67,7 +68,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap ...@@ -67,7 +68,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
private String filePath; private String filePath;
/** 应用公网地址 */ /** 应用公网地址 */
@Value("${serviceUrl:http://8.136.255.30:11011/h5/#?socialCode=}") @Value("${serviceUrl:http://81.136.255.30:11011/h5/#?socialCode=}")
private String serviceUrl; private String serviceUrl;
@Autowired @Autowired
...@@ -179,10 +180,25 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap ...@@ -179,10 +180,25 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
super.validData(entity, context); super.validData(entity, context);
} }
private void createFormContent(ApplyLogEntity applyLogEntity){
JSONObject formContentJson = new JSONObject();
formContentJson.put("i_1_市场主体名称",applyLogEntity.getEnterpriseName());
formContentJson.put("i_2_许可证编号",applyLogEntity.getCertificateCode());
formContentJson.put("i_3_统一社会信用代码",applyLogEntity.getSocialCode());
formContentJson.put(" i_5_法定代表人(负责人)",applyLogEntity.getLegalPerson());
formContentJson.put("i_8_经营场所",applyLogEntity.getBusinessPlace());
formContentJson.put("i_9_行业类别",applyLogEntity.getIndustryName());
formContentJson.put("i_10_许可项目",applyLogEntity.getLicenseProject());
formContentJson.put("i_11_制证日期", DateUtils.getStrDate(applyLogEntity.getIssueTime()));
formContentJson.put("i_14_制证机关",applyLogEntity.getAuthority());
applyLogEntity.setFormContent(formContentJson.toJSONString());
}
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public ApplyLogEntity save(ApplyLogEntity applyLogEntity, Context context) throws AppException { public ApplyLogEntity save(ApplyLogEntity applyLogEntity, Context context) throws AppException {
validData(applyLogEntity,context); validData(applyLogEntity,context);
createFormContent(applyLogEntity);
Long oldId = null; Long oldId = null;
boolean is_record = false; boolean is_record = false;
CertificateCatalogEntity catalog = certificateCatalogService.get(applyLogEntity.getCatalogId()); CertificateCatalogEntity catalog = certificateCatalogService.get(applyLogEntity.getCatalogId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment