Merge remote-tracking branch 'origin/baotou-signup' into baotou-signup

src/main/java/cn/com/tenlion/dao/examination/distributioncard/IDistributionCardDao.java

@@ -117,4 +117,5 @@ public interface IDistributionCardDao {
      */
     Integer count(Map<String, Object> params) throws SearchException;
 
+    void updateFieldId(Map<String, Object> update) throws UpdateException;
 }

src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java

@@ -322,7 +322,14 @@ public class DistributionServiceImpl extends DefaultBaseService implements IDist
                 vo.setFieldName(field.getOrganizationName());
                 vo.setFieldNumber(field.getOrganizationUserNum());
                 vo.setFieldStatus("0");
-                iDistributionFieldService.save(vo);
+                String distributionFieldId = iDistributionFieldService.saveReturnId(vo);
+                /**
+                 * 更新card关联
+                 */
+                Map<String, Object> update = new HashMap<String, Object>();
+                update.put("fieldId", field.getOrganizationId());
+                update.put("distributionFieldId", distributionFieldId);
+                iDistributionCardService.updateFieldId(update);
             }
             /**
              * 保存考试申请

src/main/java/cn/com/tenlion/service/examination/distributioncard/IDistributionCardService.java

@@ -213,4 +213,5 @@ public interface IDistributionCardService {
      */
     Integer count(Map<String, Object> params);
 
+    void updateFieldId(Map<String, Object> update);
 }

src/main/java/cn/com/tenlion/service/examination/distributioncard/impl/DistributionCardServiceImpl.java

@@ -323,4 +323,9 @@ public class DistributionCardServiceImpl extends DefaultBaseService implements I
         return count == null ? 0 : count;
     }
 
+    @Override
+    public void updateFieldId(Map<String, Object> update) {
+        distributionCardDao.updateFieldId(update);
+    }
+
 }

src/main/resources/mybatis/mapper/distributioncard/distribution-card-mapper.xml

@@ -129,6 +129,17 @@
         </foreach>
     </update>
 
+    <update id="updateFieldId" parameterType="map">
+        UPDATE
+            e_distribution_card
+        SET
+            distribution_field_id = #{distributionFieldId},
+            gmt_modified = #{gmtModified},
+            modifier = #{modifier}
+        WHERE
+            distribution_field_id = #{fieldId}
+    </update>
+
     <!-- 修改考场分配准考证 -->
     <update id="update" parameterType="map">
         UPDATE