add

.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/jiasm-syncdata.iml" filepath="$PROJECT_DIR$/.idea/jiasm-syncdata.iml" />
+      <module fileurl="file://$PROJECT_DIR$/jiasm-syncdata.iml" filepath="$PROJECT_DIR$/jiasm-syncdata.iml" />
     </modules>
   </component>
 </project>

src/main/java/com/zfire/jiasm/syncdata/plus/entity/AdminField.java

@@ -80,6 +80,9 @@ public class AdminField extends Model<AdminField> {
 
     private Boolean hide;
 
+    @ApiModelProperty(value = "枚举选项json")
+    private String enumMap;
+
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 

src/main/java/com/zfire/jiasm/syncdata/plus/entity/BrandWebsit.java

@@ -42,7 +42,7 @@ public class BrandWebsit extends Model<BrandWebsit> {
     @ApiModelProperty(value = "格力系统网点编号")
     private String sysWebsitNumber;
 
-    @ApiModelProperty(value = "品牌的网点编号")
+    @ApiModelProperty(value = "格力品牌的网点编号")
     private String brandWebsitNumber;
 
     @ApiModelProperty(value = "格力品牌的网点名称")
@@ -54,10 +54,10 @@ public class BrandWebsit extends Model<BrandWebsit> {
     @ApiModelProperty(value = "负责人手机")
     private String yddh;
 
-    @ApiModelProperty(value = "电话号码")
+    @ApiModelProperty(value = "办公电话号码")
     private String dhhm;
 
-    @ApiModelProperty(value = "是否独立法人机构")
+    @ApiModelProperty(value = "是否独立法人机构(是、否)")
     private String sfdlfr;
 
     @ApiModelProperty(value = "企业法人代表")
@@ -87,16 +87,16 @@ public class BrandWebsit extends Model<BrandWebsit> {
     @ApiModelProperty(value = "服务类目")
     private String fwlm;
 
-    @ApiModelProperty(value = "网点级别（1、2、3级）")
+    @ApiModelProperty(value = "网点级别（一、二、三级）")
     private String wdjb;
 
-    @ApiModelProperty(value = "是否电商签约网点：销售")
+    @ApiModelProperty(value = "是否承揽电商工单(是、否)")
     private String sfdsqy;
 
     @ApiModelProperty(value = "服务热线")
     private String fwrx;
 
-    @ApiModelProperty(value = "网点状态(1未启用、2正常、3锁定)")
+    @ApiModelProperty(value = "网点状态(1无效、2有效)")
     private Integer stat;
 
     @ApiModelProperty(value = "售后人员总数")
@@ -132,10 +132,10 @@ public class BrandWebsit extends Model<BrandWebsit> {
     @ApiModelProperty(value = "县/区")
     private String xian;
 
-    @ApiModelProperty(value = "乡镇")
+    @ApiModelProperty(value = "乡镇(街道)")
     private String xzhen;
 
-    @ApiModelProperty(value = "地址")
+    @ApiModelProperty(value = "详细地址")
     private String dizi;
 
     @ApiModelProperty(value = "区号")

src/main/java/com/zfire/jiasm/syncdata/plus/entity/InsureWorkerCommercial.java

@@ -50,6 +50,9 @@ public class InsureWorkerCommercial extends Model<InsureWorkerCommercial> {
     @ApiModelProperty(value = "结束时间")
     private Date endTime;
 
+    @ApiModelProperty(value = "状态 ON=启用  OFF=关闭")
+    private String status;
+
     @ApiModelProperty(value = "审核状态 WAIT=待审核 OK=通过  FAIL=失败")
     private String examineStatus;
 
@@ -65,6 +68,12 @@ public class InsureWorkerCommercial extends Model<InsureWorkerCommercial> {
     @ApiModelProperty(value = "保单号")
     private String insureBill;
 
+    @ApiModelProperty(value = "保单名称")
+    private String insureName;
+
+    @ApiModelProperty(value = "保单类型")
+    private String insureType;
+
     @ApiModelProperty(value = "保单公司")
     private String insureCompany;
 

src/main/java/com/zfire/jiasm/syncdata/plus/entity/WorkerCert.java

@@ -75,6 +75,12 @@ public class WorkerCert extends Model<WorkerCert> {
     @ApiModelProperty(value = "审核状态 WAIT=待审核 OK=通过  FAIL=不通过")
     private String examineStatus;
 
+    @ApiModelProperty(value = "身份证名称(身份证证件专属字段)")
+    private String name;
+
+    @ApiModelProperty(value = "身份证性别(身份证证件专属字段)")
+    private String sex;
+
 
     @Override
     protected Serializable pkVal() {

src/main/java/com/zfire/jiasm/syncdata/plus/entity/WorkerSkillLevelLabel.java

@@ -37,12 +37,9 @@ public class WorkerSkillLevelLabel extends Model<WorkerSkillLevelLabel> {
     @ApiModelProperty(value = "类型 INSTALL=安装  REPAIR=维修 WHOLES=安维一体")
     private String type;
 
-    @ApiModelProperty(value = "级别称号（在程序写死）")
+    @ApiModelProperty(value = "级别称号（字典）")
     private String levelLabel;
 
-    @ApiModelProperty(value = "技能等级id")
-    private String workerSkillLevelId;
-
     @ApiModelProperty(value = "最低值")
     private Integer beforeValue;
 

src/main/java/com/zfire/jiasm/syncdata/task/GLPPGFWebsitTask.java

@@ -62,9 +62,9 @@ public class GLPPGFWebsitTask {
     @Scheduled(fixedDelay = 1 * 60 * 1000)
     @Transactional(rollbackFor = Exception.class)
     public void processFSXSWDTask() throws Exception {
-        /*if (1==1){
+        if (1==1){
             return;
-        }*/
+        }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map<String, String> paramMap = new HashMap<String, String>();