Antiloveg 8 years ago
parent
commit
3c5804b959

+ 26 - 6
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -324,7 +324,8 @@
   
    
   <select id="selectUserIdentityBoByUserId" parameterType="java.lang.String" resultType="com.goafanti.user.bo.UserIdentityBo">
-  	select t.id, t.uid, t.username, t.sex, t.date_of_birth_year as dateOfBirthYear,
+  	select 
+  		   t.id, t.uid, t.username, t.sex, t.date_of_birth_year as dateOfBirthYear,
   		   t.date_of_birth_month as dateOfBirthMonth, t.id_number as idNumber, t.audit_status as auditStatus,
 		   u.mobile, u.number from user u left JOIN user_identity t
 	on t.uid = u.id where t.uid=#{uid,jdbcType=VARCHAR}
@@ -332,11 +333,30 @@
   
   <select id="selectAuditorUserIdentityByUserId" parameterType="java.lang.String" resultType="com.goafanti.user.bo.AuditorUserIdentityDetailBo">
   	select 
-  		u.aid, u.mid, ui.id, ui.uid, ui.username, ui.sex, ui.date_of_birth_year as dateOfBirthYear,
-  		ui.date_of_birth_month as dateOfBirthMonth, ui.id_number as idNumber, ui.positive_id_url as positiveIdUrl,
-  		ui.opposite_id_url as oppositeIdUrl, ui.aft_username as aftUsername, ui.province, ui.city, ui.area, ui.contact_mobile as contactMobile,
-  		ui.bank_name as bankName, ui.bank_account as bankAccount, ui.bank_card_number as bankCardNumber, ui.amount_money as amountMoney,
-  		ui.audit_status as auditStatus, ui.payment_date as paymentDate, ui.expert, ui.celebrity
+  		u.aid, 
+  		u.mid, 
+  		ui.id, 
+  		ui.uid, 
+  		ui.username, 
+  		ui.sex, 
+  		ui.date_of_birth_year as dateOfBirthYear,
+  		ui.date_of_birth_month as dateOfBirthMonth, 
+  		ui.id_number as idNumber, 
+  		ui.positive_id_url as positiveIdUrl,
+  		ui.opposite_id_url as oppositeIdUrl, 
+  		ui.aft_username as aftUsername, 
+  		ui.province, 
+  		ui.city, 
+  		ui.area, 
+  		ui.contact_mobile as contactMobile,
+  		ui.bank_name as bankName, 
+  		ui.bank_account as bankAccount, 
+  		ui.bank_card_number as bankCardNumber, 
+  		ui.amount_money as amountMoney,
+  		ui.audit_status as auditStatus, 
+  		ui.payment_date as paymentDate, 
+  		ui.expert, 
+  		ui.celebrity
   	from user u 
   	LEFT JOIN user_identity ui on u.id = ui.uid
   	where u.id = #{uid,jdbcType=VARCHAR}

+ 1 - 1
src/main/java/com/goafanti/contract/controller/ContractApiController.java

@@ -193,7 +193,7 @@ public class ContractApiController extends CertifyApiController {
 		Contract c = new Contract();
 		BeanUtils.copyProperties(contract, c);
 		Contract ct = contractService.selectByPrimaryKey(c.getId());
-		if (null != ct && !ContractStatus.CREATE.getCode().equals(ct.getStatus())) {
+		if (null != ct && ContractStatus.CREATE.getCode().equals(ct.getStatus())) {
 			res.setData(contractService.updateByPrimaryKeySelective(c));
 		} else {
 			res.getError().add(buildError("", "当前合同为非草稿状态,无法操作!"));

+ 0 - 1
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -753,7 +753,6 @@ public class UserApiController extends BaseApiController {
 	/**
 	 * 团体实名认证流程下一步
 	 * 
-	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/orgNextPro", method = RequestMethod.POST)
 	public Result orgNextProcess(OrganizationIdentity orgIdentity, String listedDateFormattedDate,