Merge branch 'master' into develop

@@ -96,6 +96,8 @@ public class PickAuditBiz {
             }
             if (!map.isEmpty()) {
                 pickDao.updateDate(map);
+                map.put("status", actionIn);
+                outpropApplyDao.updateStatus(map);
             }
         } else {
             outmap.put("resultCode", 0);

@@ -23,4 +23,6 @@ public interface OutpropApplyDao extends OracleDao {
 
     OutpropApplyInfo queryByPositionStr(String positionStr);
 
+    void updateStatus(Map<String, Object> params);
+
 }

@@ -41,5 +41,13 @@
 		FROM HS_ASSET.OUTPROPAPPLY T 
 		WHERE T.POSITION_STR = #{value} 
 	</select>
-	
+
+	<update id="updateStatus" parameterType="map">
+		UPDATE HS_ASSET.OUTPROPAPPLY SET
+		<if test="status != null and auditDate != ''">
+			SDCPROPAPPLY_STATUS = #{status}
+		</if>
+		WHERE OP_STATION = #{pickNo}
+	</update>
+
 </mapper>
\ No newline at end of file