src/main/java/org/springblade/modules/permit/entity/Permit.java
@@ -64,7 +64,6 @@ * 成立日期 */ @ApiModelProperty(value = "成立日期") @TableField("establishTime") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date establishtime; src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
@@ -8,7 +8,7 @@ <result column="creditCode" property="creditcode"/> <result column="enterpriseName" property="enterprisename"/> <result column="representative" property="representative"/> <result column="establishTime" property="establishtime"/> <result column="establishtime" property="establishtime"/> <result column="registeredCapital" property="registeredcapital"/> <result column="organizationCode" property="organizationcode"/> <result column="registrationNumber" property="registrationnumber"/> src/main/java/org/springblade/modules/record/entity/Record.java
@@ -63,7 +63,6 @@ * 成立日期 */ @ApiModelProperty(value = "注册时间") @TableField("establishTime") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date establishtime; src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
@@ -8,7 +8,7 @@ <result column="creditCode" property="creditcode"/> <result column="enterpriseName" property="enterprisename"/> <result column="representative" property="representative"/> <result column="establishTime" property="establishtime"/> <result column="establishtime" property="establishtime"/> <result column="registeredCapital" property="registeredcapital"/> <result column="organizationCode" property="organizationcode"/> <result column="registrationNumber" property="registrationnumber"/> src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -92,7 +92,8 @@ @ApiOperation(value = "新增", notes = "传入recordk") public R save(@Valid @RequestBody Recordk recordk) { String cardid = recordk.getCardid(); Map map = recordkService.selectIn(cardid); String ptype = recordk.getPtype(); Map map = recordkService.selectIn(cardid,ptype); if (map!=null){ String id = map.get("id").toString(); recordkService.removeByIds(Func.toLongList(id)); @@ -110,7 +111,8 @@ @ApiOperation(value = "新增", notes = "传入permit") public R recorkstorage(@Valid @RequestBody Recordk recordk) { String cardid = recordk.getCardid(); Map map = recordkService.selectIn(cardid); String ptype = recordk.getPtype(); Map map = recordkService.selectIn(cardid,ptype); if (map!=null){ recordk.setStorage("0"); recordkService.updateById(recordk); @@ -156,8 +158,8 @@ @PostMapping("/selectIn") public R selectIn(String cardid) { Map map = recordkService.selectIn(cardid); public R selectIn(String cardid,String type) { Map map = recordkService.selectIn(cardid,type); return R.data(map); } src/main/java/org/springblade/modules/recordk/entity/Recordk.java
@@ -153,12 +153,12 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date permitime; private String reason; private String cardid; private String representativecell; private String contacts; private String contactscell; private String storage; private String approve; } src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.java
@@ -40,5 +40,5 @@ * @return */ List<RecordkVO> selectRecordkPage(IPage page, RecordkVO recordk); Map selectIn(String cardid); Map selectIn(String cardid,String type); } src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml
@@ -31,6 +31,7 @@ <result column="contacts" property="contacts"/> <result column="contactscell" property="contactscell"/> <result column="storage" property="storage"/> <result column="approve" property="approve"/> </resultMap> @@ -39,6 +40,6 @@ </select> <select id="selectIn" resultType="java.util.HashMap"> select * from sys_recordk where storage=0 and cardid=#{cardid} select * from sys_recordk where cardid=#{cardid} and ptype=#{type} </select> </mapper> src/main/java/org/springblade/modules/recordk/service/IRecordkService.java
@@ -39,5 +39,5 @@ * @return */ IPage<RecordkVO> selectRecordkPage(IPage<RecordkVO> page, RecordkVO recordk); Map selectIn(String cardid); Map selectIn(String cardid,String type); } src/main/java/org/springblade/modules/recordk/service/impl/RecordkServiceImpl.java
@@ -41,8 +41,8 @@ } @Override public Map selectIn(String cardid) { return baseMapper.selectIn(cardid); public Map selectIn(String cardid,String type) { return baseMapper.selectIn(cardid,type); } } src/main/java/org/springblade/modules/revoke/entity/Revoke.java
@@ -63,7 +63,6 @@ * 成立日期 */ @ApiModelProperty(value = "成立日期") @TableField("establishTime") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date establishtime; src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
@@ -8,7 +8,7 @@ <result column="creditCode" property="creditcode"/> <result column="enterpriseName" property="enterprisename"/> <result column="representative" property="representative"/> <result column="establishTime" property="establishtime"/> <result column="establishtime" property="establishtime"/> <result column="registeredCapital" property="registeredcapital"/> <result column="organizationCode" property="organizationcode"/> <result column="registrationNumber" property="registrationnumber"/>