30号版本：档案合同、商险、薪资状态；缴费库反馈列；合同提交的直接审核优化等

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java

@@ -1635,32 +1635,19 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @return: int
 	 **/
 	private int judgeStatus(TInsuranceDetail detail) {
-		// DELETE_FLAG = 0
-		//	AND IS_EFFECT = 0 #是否有效
-		//	AND IS_USE = 0 #是否出险
-		//	AND IS_OVERDUE = 0 #是否过期
-		//	AND DELETE_FLAG = 0 #是否删除
-		//	AND BUY_HANDLE_STATUS = 3 #投保状态
-		//	AND ( REDUCE_HANDLE_STATUS IS NULL OR REDUCE_HANDLE_STATUS = 3 ) #减员状态
-		if (detail.getIsEffect() == CommonConstants.ZERO_INT
-				&& detail.getIsOverdue() == CommonConstants.ZERO_INT
-				&& detail.getIsUse() == CommonConstants.ZERO_INT
-				&& (detail.getBuyHandleStatus() == CommonConstants.THREE_INT
-				&& (Common.isEmpty(detail.getReduceHandleStatus()) || detail.getReduceHandleStatus() == CommonConstants.THREE_INT))) {
-			return CommonConstants.TWO_INT;
-		} else {
-
-		}
 		// （0无2正常3失效4处理中）
 		if (detail.getBuyHandleStatus() == CommonConstants.FOUR_INT) {
 			return CommonConstants.ZERO_INT;
-		} else if (detail.getIsOverdue() == CommonConstants.ZERO_INT
+		} else if (detail.getIsEffect() == CommonConstants.ZERO_INT
+				&& detail.getIsOverdue() == CommonConstants.ZERO_INT
+				&& (detail.getBuyHandleStatus() == CommonConstants.THREE_INT
+				&& (Common.isEmpty(detail.getReduceHandleStatus()) || detail.getReduceHandleStatus() != CommonConstants.FOUR_INT))) {
+			return CommonConstants.TWO_INT;
+		} else if (detail.getIsOverdue() == CommonConstants.ONE_INT
 				|| detail.getIsEffect() == CommonConstants.ONE_INT
-				|| detail.getBuyHandleStatus() == CommonConstants.FOUR_INT
+				|| detail.getReduceHandleStatus() == CommonConstants.FOUR_INT
 				|| detail.getBuyHandleStatus() == CommonConstants.FIVE_INT) {
 			return CommonConstants.THREE_INT;
-		} else if (detail.getBuyHandleStatus() == CommonConstants.THREE_INT) {
-			return CommonConstants.TWO_INT;
 		} else {
 			return CommonConstants.FOUR_INT;
 		}