xg

src/front/project.go

@@ -1234,9 +1234,9 @@ func GetDataById(idInfoArr []util.Data, appid, importType string, success *bool,
 				}
 				if bidData != nil && len(*bidData) > 0 { //bidding表数据存在
 					//2.查extract
-					extData, _ := util.MgoE.FindById(util.ExtColl1, id, map[string]interface{}{"attach_text": 0, "field_source": 0, "log": 0})
+					extData, _ := util.MgoE.FindById(util.ExtColl1, id, map[string]interface{}{"attach_text": 0, "field_source": 0, "log": 0, "regions_log": 0})
 					if extData == nil || len(*extData) == 0 {
-						extData, _ = util.MgoE.FindById(util.ExtColl2, id, map[string]interface{}{"attach_text": 0, "field_source": 0, "log": 0})
+						extData, _ = util.MgoE.FindById(util.ExtColl2, id, map[string]interface{}{"attach_text": 0, "field_source": 0, "log": 0, "regions_log": 0})
 					}
 					//抽取表字段合并到bidding
 					if extData != nil && len(*extData) > 0 {

src/web/templates/project/project_list.html

@@ -83,6 +83,17 @@
                                         <input type="text" class="form-control" id="project-name" placeholder="项目名称" onblur="checkProName()">
                                     </div>
                                 </div>
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label"><span style="color:red;">* </span>清洗流程</label>
+                                    <div class="col-sm-5">
+                                        <label class="radio-inline">
+                                            <input type="radio" name="clear-type" value="normal" checked>正常清洗流程
+                                        </label>
+                                        <label class="radio-inline">
+                                            <input type="radio" name="clear-type" value="interior">内部清洗流程
+                                        </label>
+                                    </div>
+                                </div>
                                 <div id="import-coll">
                                     <h5><i class="glyphicon glyphicon-bookmark"
                                            style="color: #00c4ff;margin-right: 6px"></i>数据来源</h5>
@@ -111,7 +122,7 @@
                                     </div>
                                     <div class="form-group">
                                         <label class="col-sm-3 control-label"><span
-                                                style="color:red;">* </span>数据导出ID</label>
+                                                style="color:red;">* </span>数据导出条件</label>
                                         <div class="col-sm-5">
                                             <input type="text" class="form-control" id="data-query"
                                                    placeholder='{"creattime": 1751823604, "field": "xxx"}'>
@@ -497,6 +508,8 @@
 
     function importData() {
         let sname = $('#project-name').val()
+        let clearType = $("input[type='radio'][name='clear-type']:checked").val()
+        console.log(clearType)
         if (sname === "") {
             alert("项目名称为必填项")
             return
@@ -522,6 +535,7 @@
             projectmap["s_type"] = stype
             projectmap["coll"] = coll
             projectmap["s_query"] = query
+            projectmap["s_clear"] = clearType
             showLoading("正在加载数据，请稍候...")
             $.ajax({
                 url: "/front/project/save",
@@ -546,6 +560,7 @@
             formData.append("s_departname", $('#dpart-name').val())
             formData.append("s_rulename", $('#rule-name').val())
             formData.append("s_type", stype)
+            formData.append("s_clear", clearType)
             let file = $('#uploadfile')[0].files[0]
             if (file) {
                 formData.append("xlsx", file)